From: Greg Brockman <gdb@mit.edu>
Date: Tue, 6 Jul 2010 04:28:20 +0000 (-0400)
Subject: Don't require that a pocket exists when validating
X-Git-Tag: 0.1.5~10
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/commitdiff_plain/831c3571b0d8e86049b0b9ec5e27c3c2e5f49b1a?hp=94bf6022689c29a7e27df0710f0b1d63d578038d

Don't require that a pocket exists when validating

svn path=/trunk/packages/invirt-dev/; revision=3042
---

diff --git a/python/invirt/builder.py b/python/invirt/builder.py
index c800cf8..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: