Save build log to file containing package name

diff --git a/debian/changelog b/debian/changelog
index b8710ca..a05a0ae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-dev (0.1.7) unstable; urgency=low
+
+  * Save build log to file containing package name
+
+ -- Greg Brockman <gdb@mit.edu>  Mon, 23 Aug 2010 18:12:45 -0400
+

 invirt-dev (0.1.6) unstable; urgency=low
 
   * Use correct call signature for authz.expandAdmin
 invirt-dev (0.1.6) unstable; urgency=low
 
   * Use correct call signature for authz.expandAdmin

diff --git a/invirtibuilder b/invirtibuilder
index 2f28103..6f3d917 100755 (executable)
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -301,13 +301,15 @@ def build():
         logdir = os.path.join(b._LOG_DIR, str(db.build_id))
         if not os.path.exists(logdir):
             os.makedirs(logdir)
         logdir = os.path.join(b._LOG_DIR, str(db.build_id))
         if not os.path.exists(logdir):
             os.makedirs(logdir)

-        logfile = open(os.path.join(logdir, 'build.log'), 'w')

 
         try:
             db.failed_stage = 'validating job'
             # Don't expand the commit in the DB until we're sure the user
             # isn't trying to be tricky.
             b.ensureValidPackage(package)
 
         try:
             db.failed_stage = 'validating job'
             # Don't expand the commit in the DB until we're sure the user
             # isn't trying to be tricky.
             b.ensureValidPackage(package)

+
+            logfile = open(os.path.join(logdir, '%s.log' % db.package), 'w')
+

             db.commit = commit = b.canonicalize_commit(package, commit)
             src = b.validateBuild(pocket, package, commit)
             version = b.getVersion(package, commit)
             db.commit = commit = b.canonicalize_commit(package, commit)
             src = b.validateBuild(pocket, package, commit)
             version = b.getVersion(package, commit)

@@ -374,7 +376,8 @@ def build():
             db.succeeded = True
             db.failed_stage = None
         finally:
             db.succeeded = True
             db.failed_stage = None
         finally:

-            logfile.close()
+            if logfile is not None:
+                logfile.close()

 
             database.session.save_or_update(db)
             database.session.commit()
 
             database.session.save_or_update(db)
             database.session.commit()