[ARVADOS-DEV] updated: c0e1dbb244f0cf8d838ebd9296e797a0a2f23fdf

[git at public.curoverse.com]

Summary of changes:
 jenkins/run_upload_packages.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

       via  c0e1dbb244f0cf8d838ebd9296e797a0a2f23fdf (commit)
      from  34ef97e556eff9a315160f0317a6652154d749f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c0e1dbb244f0cf8d838ebd9296e797a0a2f23fdf
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Jul 23 16:59:11 2015 -0400

    6497: Bugfix distro names for DebianPackageSuites.
    
    freight is expecting a codename like wheezy or jessie, but we've been
    using our internal distro+version names there.  This fixes that.
    
    Nico gave a thumbs up to this patch.  Refs #6497.

diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index 3eac15b..fb4defd 100755
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -144,15 +144,21 @@ class DistroPackageSuite(PackageSuite):
 class DebianPackageSuite(DistroPackageSuite):
     FREIGHT_SCRIPT = """
 cd "$1"; shift
-TARGET=$1; shift
-freight add "$@" "apt/$TARGET"
+DISTNAME=$1; shift
+freight add "$@" "apt/$DISTNAME"
 freight cache
 rm "$@"
 """
+    TARGET_DISTNAMES = {
+        'debian7': 'wheezy',
+        'debian8': 'jessie',
+        'ubuntu1204': 'precise',
+        }
 
     def post_uploads(self, paths):
         self._run_script(self.FREIGHT_SCRIPT, self.REMOTE_DEST_DIR,
-                         self.target, *self._paths_basenames(paths))
+                         self.TARGET_DISTNAMES[self.target],
+                         *self._paths_basenames(paths))
 
 
 class RedHatPackageSuite(DistroPackageSuite):

-----------------------------------------------------------------------


hooks/post-receive
--