X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/blobdiff_plain/929f1553a7e60441bee2b53fed3530445a7299cf..831c3571b0d8e86049b0b9ec5e27c3c2e5f49b1a:/python/invirt/builder.py

diff --git a/python/invirt/builder.py b/python/invirt/builder.py
index b3aa08f..b4a7abf 100644
--- a/python/invirt/builder.py
+++ b/python/invirt/builder.py
@@ -6,9 +6,9 @@ and the remctl submission scripts that insert items into its queue.
 
 
 import os
+import subprocess
 
 from debian_bundle import changelog
-from debian_bundle import deb822
 
 import invirt.common as c
 from invirt.config import structs as config
@@ -124,8 +124,13 @@ def validateBuild(pocket, package, commit):
             continue
 
         b = pocketToGit(p)
-        current_commit = c.captureOutput(['git', 'rev-parse', b],
-                                         cwd=package_repo).strip()
+        try:
+            current_commit = c.captureOutput(['git', 'rev-parse', b],
+                                             cwd=package_repo).strip()
+        except subprocess.CalledProcessError:
+            # Guess we haven't created this pocket yet
+            continue
+
         current_version = getVersion(package, b)
 
         if current_version == new_version:
@@ -146,7 +151,8 @@ def validateBuild(pocket, package, commit):
 
         # Almost by definition, A is a fast-forward of B if B..A is
         # empty
-        if not c.captureOutput(['git', 'rev-list', '%s..%s' % (commit, branch)]):
+        if not c.captureOutput(['git', 'rev-list', '%s..%s' % (commit, branch)],
+                               cwd=package_repo):
             raise InvalidBuild('New commit %s of %s is not a fast-forward of'
                                'commit currently in pocket %s' %
                                (commit, package, pocket))