Changeset 3035 for trunk

Timestamp:

Jul 6, 2010, 12:27:41 AM (14 years ago)

Author:

gdb

Message:

Use the expanded commit name internally

Location:

trunk/packages/invirt-dev

Files:

• invirt-submit-build (modified) (1 diff)
• invirtibuilder (modified) (1 diff)
• python/invirt/builder.py (modified) (3 diffs)

trunk/packages/invirt-dev/invirt-submit-build

@@ -42 +42 @@
 
     try:
+        # TODO: clean up this interface.
+        b.ensureValidPackage(package)
+        commit = b.canonicalize_commit(package, commit)
         b.validateBuild(pocket, package, commit)
     except b.InvalidBuild, e:

trunk/packages/invirt-dev/invirtibuilder

@@ -289 +289 @@
         try:
             db.failed_stage = 'validating job'
-            src = b.validateBuild(pocket, package, commit)
             # Don't expand the commit in the DB until we're sure the user
             # isn't trying to be tricky.
-            db.commit = commit = c.captureOutput(['git', 'rev-parse', commit],
-                                                 cwd=b.getRepo(package)).strip()
+            b.ensureValidPackage(package)
+            db.commit = commit = b.canonicalize_commit(package, commit)
+            src = b.validateBuild(pocket, package, commit)
 
             db.version = str(b.getVersion(package, commit))

trunk/packages/invirt-dev/python/invirt/builder.py

@@ -29 +29 @@
     return os.path.join(_REPO_DIR, 'invirt/packages', '%s.git' % package)
 
-def ensureValidRepo(package):
+def ensureValidPackage(package):
     """Perform some basic sanity checks that the requested repo is in a
     subdirectory of _REPO_DIR/invirt/packages.  This prevents weirdness
@@ -42 +42 @@
     elif not os.path.exists(repo):
         raise InvalidBuild('Nonexisting package %s' % package)
+
+def canonicalize_commit(package, commit, shorten=False):
+    if shorten:
+        flags = ['--short']
+    else:
+        flags = []
+    return c.captureOutput(['git', 'rev-parse'] + flags + [commit],
+                           cwd=getRepo(package)).strip()
 
 def pocketToGit(pocket):
@@ -99 +107 @@
     it returns True.
     """
-    ensureValidRepo(package)
+    ensureValidPackage(package)
     package_repo = getRepo(package)
     new_version = getVersion(package, commit)