Fixed conflicts from version vs dev

diff --git a/debian/changelog b/debian/changelog
index d23c8f7..1508207 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,25 @@
-invirt-dev (0.1.20) precise; urgency=low
+invirt-dev (0.1.22) precise; urgency=low
 
   * Fixed formatting in the README
 
  -- Steven Valdez <dvorak42@mit.edu>  Wed, 20 Mar 2013 02:37:34 -0400
 
+invirt-dev (0.1.21) unstable; urgency=low
+
+  * The "git archive" command broke on recent Git.  Replace
+    --remote=file: with the standard --git-dir, which works.
+
+ -- Greg Price <price@mit.edu>  Sat, 09 Mar 2013 17:06:42 -0500
+
+invirt-dev (0.1.20) unstable; urgency=low
+
+  * Support getting Git commits from elsewhere, for xvm-dev
+    (Requires manually setting up the clones in /srv/git/invirt/packages/,
+    with --mirror=fetch remotes.  Currently expecting this to be a
+    temporary setup anyway.)
+
+ -- Greg Price <price@mit.edu>  Sat, 09 Mar 2013 16:11:23 -0500
+
 invirt-dev (0.1.19) unstable; urgency=low
 
   * Add a repo_access configuration hook to grant VCS access to

diff --git a/invirt-submit-build b/invirt-submit-build
index 4bed2ee..f202c3d 100755 (executable)
--- a/invirt-submit-build
+++ b/invirt-submit-build
@@ -24,6 +24,8 @@ import sys
 import tempfile
 import uuid
 
+from invirt.config import structs as config
+import invirt.common as c
 import invirt.builder as b
 
 
@@ -43,6 +45,8 @@ def main():
     try:
         # TODO: clean up this interface.
         b.ensureValidPackage(package)
+        if config.build.get('mirror'):
+            c.captureOutput(['git', 'fetch'], cwd=b.getRepo(package))
         commit = b.canonicalize_commit(package, commit)
         b.validateBuild(pocket, package, commit)
     except b.InvalidBuild, e:

diff --git a/invirtibuilder b/invirtibuilder
index bf3b499..fd1417f 100755 (executable)
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -287,8 +287,8 @@ def packageWorkdir(package, commit, build_id):
     workdir = tempfile.mkdtemp(prefix=("b%d-" % build_id))
     try:
         p_archive = subprocess.Popen(
-            ['git', 'archive',
-             '--remote=file://%s' % b.getRepo(package),
+            ['git', '--git-dir=%s' % (b.getRepo(package),),
+             'archive',
              '--prefix=%s/' % package,
              commit,
              ],