X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/blobdiff_plain/bf0b91f66f80e00c8fb6dfa102b8b71f9c0c96b1..refs/heads/precise-prod:/invirtibuilder?ds=sidebyside

diff --git a/invirtibuilder b/invirtibuilder
index eac57f3..43f09f1 100755
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -133,12 +133,13 @@ def sbuild(package, ref, distro, arch, workdir, arch_all=False):
     nmutag = b.distroToSuffix(distro)
     env = os.environ.copy()
     env['NMUTAG'] = nmutag
-
+    maintainer = "Invirt Autobuilder <%s>" % (config.contact,)
     # Run sbuild with a hack in place to append arbitrary versions
     args = ['perl', '-I/usr/share/invirt-dev', '-MSbuildHack',
             '/usr/bin/sbuild',
             '--binNMU=171717', '--make-binNMU=Build with sbuild',
-            '-v', '-d', distro, '--arch', arch]
+            '-v', '-d', distro, '-m', maintainer, 
+            '--arch', arch]
     if arch_all:
         args.append('-A')
     args.append(getDscName(package, ref))
@@ -354,7 +355,7 @@ def build():
         db.pocket = pocket
         db.commit = commit
         db.principal = principal
-        database.session.save_or_update(db)
+        database.session.add(db)
         database.session.commit()
 
         database.session.begin()
@@ -415,11 +416,8 @@ def build():
                     # If we were, we could use debuild and get nice
                     # environment scrubbing. Since we're not, debuild
                     # complains about not having an orig.tar.gz
-                    logAndRun(['schroot', '-c', 
-                               '%s-amd64-sbuild' % (b.pocketToDistro(pocket),), 
-                               '--', 'dpkg-buildpackage', '-us', '-uc', '-S'],
+                    logAndRun(['dpkg-buildpackage', '-us', '-uc', '-S'],
                               cwd=packagedir)
-
                     db.failed_stage = 'building binary packages'
                     sbuildAll(package, commit, b.pocketToDistro(pocket), workdir)
                     db.failed_stage = 'tagging submodule'
@@ -443,7 +441,7 @@ def build():
             if logfile is not None:
                 logfile.close()
 
-            database.session.save_or_update(db)
+            database.session.add(db)
             database.session.commit()
 
             # Finally, now that everything is done, remove the