More bug fixes for multi-distro support

diff --git a/debian/changelog b/debian/changelog
index 22acb3f..b5a355d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-dev (0.1.14) unstable; urgency=low
+
+  * More bug fixes for multi-distro support
+
+ -- Quentin Smith <quentin@mit.edu>  Sat, 15 Oct 2011 18:44:42 -0400
+

 invirt-dev (0.1.13) unstable; urgency=low
 
   * Properly invoke SbuildHack
 invirt-dev (0.1.13) unstable; urgency=low
 
   * Properly invoke SbuildHack

diff --git a/invirtibuilder b/invirtibuilder
index 527695a..2882272 100755 (executable)
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -218,7 +218,7 @@ def updateSuperproject(pocket, package, commit, principal, version, env):
     tree = logAndRun(['git', 'ls-tree', branch],
                      cwd=superproject).strip()
 
     tree = logAndRun(['git', 'ls-tree', branch],
                      cwd=superproject).strip()
 

-    tree_items = dict(k, v for v, k in (x.split("\t" for x in tree.split("\n"))))
+    tree_items = dict((k, v) for (v, k) in (x.split("\t") for x in tree.split("\n")))

 
     created = not (package in tree_items)
 
 
     created = not (package in tree_items)
 

@@ -227,15 +227,15 @@ def updateSuperproject(pocket, package, commit, principal, version, env):
     # If "created" is true, we need to check if the package is
     # mentioned in .gitmodules, and add it if not.
     if created:
     # If "created" is true, we need to check if the package is
     # mentioned in .gitmodules, and add it if not.
     if created:

-        gitmodules = c.captureOutput(['git', 'cat-file', 'blob', '%s:.gitmodules' % (branch)],
-                                     cwd=superproject)
+        gitmodules = logAndRun(['git', 'cat-file', 'blob', '%s:.gitmodules' % (branch)],
+                               cwd=superproject)

         if ('[submodule "%s"]' % (package)) not in gitmodules.split("\n"):
             gitmodules += """[submodule "%s"]
 \tpath = %s
 \turl = ../packages/%s.git
 """ % (package, package, package)
         if ('[submodule "%s"]' % (package)) not in gitmodules.split("\n"):
             gitmodules += """[submodule "%s"]
 \tpath = %s
 \turl = ../packages/%s.git
 """ % (package, package, package)

-            gitmodules_hash = c.captureOutput(['git', 'hash-object', '-w', '--stdin'],
-                                              cwd=superproject).strip()
+            gitmodules_hash = logAndRun(['git', 'hash-object', '-w', '--stdin'],
+                                        cwd=superproject).strip()

             tree_items[package] = "100644 blob "+gitmodules_hash
 
     new_tree = "\n".join("%s\t%s" % (v, k) for (k, v) in tree_items.iteritems())
             tree_items[package] = "100644 blob "+gitmodules_hash
 
     new_tree = "\n".join("%s\t%s" % (v, k) for (k, v) in tree_items.iteritems())

@@ -248,10 +248,10 @@ def updateSuperproject(pocket, package, commit, principal, version, env):
         commit_msg = 'Add %s at version %s'
     else:
         commit_msg = 'Update %s to version %s'
         commit_msg = 'Add %s at version %s'
     else:
         commit_msg = 'Update %s to version %s'

-    commit_msg = (commit_msg + '\n\n'
-                  'Requested by %s' % (package,
-                                       version.full_version,
-                                       principal))
+    commit_msg = ((commit_msg + '\n\n'
+                   'Requested by %s') % (package,
+                                         version.full_version,
+                                         principal))

     new_commit = logAndRun(
         ['git', 'commit-tree', new_tree_id, '-p', branch],
         cwd=superproject,
     new_commit = logAndRun(
         ['git', 'commit-tree', new_tree_id, '-p', branch],
         cwd=superproject,