Merge branch 'packaging' into debian-0.9

[pithos] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index 66e6352..e7872cb 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -53,12 +53,11 @@ env.roledefs = {
 }
 
 
-# colored logging
+# coloured logging
 notice = lambda x: sys.stdout.write(yellow(x) + "\n")
 info = lambda x: sys.stdout.write(green(x) + "\n")
 error = lambda x: sys.stdout.write(red(x) + "\n")
 
-
 def dev():
     env.develop = True
 
@@ -87,7 +86,10 @@ def remove_pkg(p):
 def build_pkg(p):
     info ("building package: %s" % p)
     with lcd(package_root(p)):
-        local("rm -r dist build")
+        try:
+            local("rm -r dist build")
+        except:
+            pass
         local("python setup.py egg_info -d sdist")
 
 
@@ -167,10 +169,10 @@ def co(c):
 # Debian packaging helpers
 #
 
-env.debian_branch = 'debian-0.8'
+env.debian_branch = 'debian-0.9'
 env.deb_packages = ['snf-pithos-lib', 'snf-pithos-backend',
                     'snf-pithos-tools', 'snf-pithos-app']
-env.signdebs = True
+env.signdebs = False
 env.debrelease = False  # Increase release number in Debian changelogs
 env.upstream = 'packaging'
 
@@ -219,11 +221,11 @@ def debrelease():
     env.debrelease = True
 
 
-def nosigndebs():
-    env.signdebs = False
+def signdebs():
+    env.signdebs = True
 
 
-def builddeb(p, master="packaging", branch="debian-0.8"):
+def builddeb(p, master="packaging", branch="debian-0.9"):
     with co(branch):
         info("Building debian package for %s" % p)
         with lcd(package_root(p)):
@@ -239,9 +241,9 @@ def builddeb(p, master="packaging", branch="debian-0.8"):
         info("Done building debian package for %s" % p)
 
 
-def builddeball(b="debian-0.8"):
+def builddeball(b="debian-0.9"):
     for p in env.deb_packages:
-        builddeb(p, b)
+        builddeb(p=p, branch=b)
 
 
 
@@ -249,3 +251,4 @@ def builddeball(b="debian-0.8"):
 def uploadtars():
     put("packages/*.tar.gz", 'www/pypi/')
 
+