From: Sandon Van Ness <sandon@inktank.com>
Date: Tue, 14 Jan 2014 01:14:10 +0000 (-0800)
Subject: Use format() for lsb codename or distro/verison string.
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=66e4e161f9e3010468c7c80f596db9b32a98d69d;p=autobuild-ceph.git

Use format() for lsb codename or distro/verison string.


Signed-off-by: Sandon Van Ness <sandon@inktank.com>
---

diff --git a/fabfile.py b/fabfile.py
index 5ce7434..8bc75c5 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -693,12 +693,16 @@ def gitbuilder_doc():
             sudo("chmod 600 rsync-key* ; chown autobuild-ceph.autobuild-ceph rsync-key*")
 
 def _sync_to_gitbuilder(package, format, flavor):
-    lsb = '`lsb_release -s -c`'
-    if format =='rpm':
-        lsb = '`lsb_release -s -i -s | tr A-Z a-z``lsb_release -s -r | cut -d. -f1`'
+    dist_or_codename = '`lsb_release -s -c`'
+    if format == 'rpm':
+        dist_or_codename = '`lsb_release -s -i | tr A-Z a-z``lsb_release -s -r | cut -d. -f1`'
     with cd('/srv/autobuild-ceph'):
         # fugliness
-        sudo("echo gitbuilder@gitbuilder.ceph.com:gitbuilder.ceph.com/%s-%s-%s-`uname -m`-%s > rsync-target" % (package,format, lsb, flavor))
+        sudo("echo gitbuilder@gitbuilder.ceph.com:gitbuilder.ceph.com/{package}-{format}-{dist_or_codename}-`uname -m`-{flavor} > rsync-target".format(
+            package=package,
+            format=format,
+            dist_or_codename=dist_or_codename,
+            flavor=flavor))
         _sync_rsync_keys()
 
 def _sync_rsync_keys():