Properly update the superrepo's .gitmodules file

diff --git a/debian/changelog b/debian/changelog
index 5b9aba4..173343d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-dev (0.1.16) unstable; urgency=low
+
+  * Properly update the superrepo's .gitmodules file
+
+ -- Quentin Smith <quentin@mit.edu>  Tue, 18 Oct 2011 21:57:45 -0400
+

 invirt-dev (0.1.15) unstable; urgency=low
 
   * Put the build number in the temporary directory builds happen in
 invirt-dev (0.1.15) unstable; urgency=low
 
   * Put the build number in the temporary directory builds happen in

diff --git a/invirtibuilder b/invirtibuilder
index 9260b1e..c955dfd 100755 (executable)
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -56,6 +56,9 @@ def logAndRun(cmd, *args, **kwargs):
         del kwargs['stdout']
     kwargs['stderr'] = logfile
     logfile.write('---> Ran %s\n' % (cmd, ))
         del kwargs['stdout']
     kwargs['stderr'] = logfile
     logfile.write('---> Ran %s\n' % (cmd, ))

+    if 'stdin_str' in kwargs:
+        logfile.write('STDIN:\n')
+        logfile.write(kwargs['stdin_str'])

     logfile.write('STDERR:\n')
     output = c.captureOutput(cmd, *args, **kwargs)
     logfile.write('STDOUT:\n')
     logfile.write('STDERR:\n')
     output = c.captureOutput(cmd, *args, **kwargs)
     logfile.write('STDOUT:\n')

@@ -235,7 +238,8 @@ def updateSuperproject(pocket, package, commit, principal, version, env):
 \turl = ../packages/%s.git
 """ % (package, package, package)
             gitmodules_hash = logAndRun(['git', 'hash-object', '-w', '--stdin'],
 \turl = ../packages/%s.git
 """ % (package, package, package)
             gitmodules_hash = logAndRun(['git', 'hash-object', '-w', '--stdin'],

-                                        cwd=superproject).strip()
+                                        cwd=superproject,
+                                        stdin_str=gitmodules).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())