Add mirror and arch configurations for pbuilder

BlankOn · Sep 5, 2012 · 3d76c79 · 3d76c79
1 parent b11e884
commit 3d76c79
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/irgsh_node/conf/__init__.py b/irgsh_node/conf/__init__.py
@@ -36,7 +36,9 @@
     },
     'pbuilder': {
         'path': 'PBUILDER_PATH',
-        'debootstrap': 'PBUILDER_DEBOOTSTRAP'
+        'debootstrap': 'PBUILDER_DEBOOTSTRAP',
+        'mirror': 'PBUILDER_MIRROR',
+        'arch': 'PBUILDER_ARCH'
     },
     'upload': {
         'host': 'UPLOAD_HOST',

diff --git a/irgsh_node/conf/global_settings.py b/irgsh_node/conf/global_settings.py
@@ -9,4 +9,6 @@
 SSL_KEY = None
 
 PBUILDER_DEBOOTSTRAP = None
+PBUILDER_MIRROR = None
+PBUILDER_ARCH = None
 
diff --git a/irgsh_node/tasks.py b/irgsh_node/tasks.py
@@ -75,10 +75,14 @@ def _run(self, spec_id, task_id, taskdir, distribution, specification,
         # Create and prepare builder (pbuilder)
         pbuilder_path = settings.PBUILDER_PATH
         pbuilder_debootstrap = settings.PBUILDER_DEBOOTSTRAP
+        pbuilder_mirror = settings.PBUILDER_MIRROR
+        pbuilder_arch = settings.PBUILDER_ARCH
 
         keyring = os.path.abspath(settings.KEYRING)
         builder = Pbuilder(distribution, pbuilder_path, keyring=keyring,
-                           debootstrap=pbuilder_debootstrap)
+                           debootstrap=pbuilder_debootstrap,
+                           mirror=pbuilder_mirror,
+                           arch=pbuilder_arch)
 
         # Build package
         clog.info('Building package %s for %s' % (specification.source,