[Pkg-debile-commits] [debile-slave] 54/100: need to refactor this soon.

[Sylvestre Ledru]

This is an automated email from the git hooks/post-receive script.

sylvestre pushed a commit to branch master
in repository debile-slave.

commit ff9ca69eb56c84a515dfd91ae7f91d591dd75f49
Author: Paul Tagliamonte <tag at pault.ag>
Date:   Sat Jun 1 22:37:32 2013 -0400

    need to refactor this soon.
---
 ethel/commands/adequate.py |   11 ++++++++++-
 ethel/commands/piuparts.py |   12 +++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ethel/commands/adequate.py b/ethel/commands/adequate.py
index cdf014f..746e38a 100644
--- a/ethel/commands/adequate.py
+++ b/ethel/commands/adequate.py
@@ -1,9 +1,18 @@
 from ethel.runners.adequate import adequate
+from ethel.config import load
 
 
 def run(debs, package, job, firehose):
     if any((not x.endswith(".deb") for x in debs)):
         raise Exception("Non-deb given")
 
-    chroot_name = "{suite}-{arch}".format(**package)
+    config = load()
+    all_arch = config['all-arch']
+    if package['arch'] == 'all':
+        arch = all_arch
+
+    chroot_name = "{suite}-{arch}".format(
+        suite=package['suite'],
+        arch=arch
+    )
     return adequate(chroot_name, debs, firehose)
diff --git a/ethel/commands/piuparts.py b/ethel/commands/piuparts.py
index 2ab19e0..348c978 100644
--- a/ethel/commands/piuparts.py
+++ b/ethel/commands/piuparts.py
@@ -1,9 +1,19 @@
 from ethel.runners.piuparts import piuparts
+from ethel.config import load
 
 
 def run(debs, package, job, firehose):
     if any((not x.endswith(".deb") for x in debs)):
         raise Exception("Non-deb given")
 
-    chroot_name = "{suite}-{arch}".format(**package)
+    config = load()
+    all_arch = config['all-arch']
+    if package['arch'] == 'all':
+        arch = all_arch
+
+    chroot_name = "{suite}-{arch}".format(
+        suite=package['suite'],
+        arch=arch
+    )
+
     return piuparts(chroot_name, debs, firehose)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-slave.git