Fix references to settings not yet in master

[pithos] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index 66e6352..6fa3971 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -42,8 +42,7 @@ from fabric.colors import *
 env.project_root = "./"
 env.develop = False
 env.autoremove = True
-env.packages = ['snf-pithos-lib', 'snf-pithos-backend', 'snf-pithos-app',
-                        'snf-pithos-tools']
+env.packages = ['snf-pithos-backend', 'snf-pithos-app', 'snf-pithos-tools']
 env.capture = False
 env.colors = True
 env.pypi_root = 'pypi'
@@ -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,9 @@ def co(c):
 # Debian packaging helpers
 #
 
-env.debian_branch = 'debian-0.8'
-env.deb_packages = ['snf-pithos-lib', 'snf-pithos-backend',
-                    'snf-pithos-tools', 'snf-pithos-app']
-env.signdebs = True
+env.debian_branch = 'debian-0.9'
+env.deb_packages = ['snf-pithos-backend', 'snf-pithos-tools', 'snf-pithos-app']
+env.signdebs = False
 env.debrelease = False  # Increase release number in Debian changelogs
 env.upstream = 'packaging'
 
@@ -219,11 +220,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 +240,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)