make the invirtibuilder use sbuild to build source packages

diff --git a/debian/changelog b/debian/changelog
index 5ef3721..7ad1fdd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-dev (0.1.28ubuntu1) precise; urgency=low
+
+  * Build source packages with sbuild now that we _can_.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Mon, 29 Jul 2013 23:01:32 -0400
+

 invirt-dev (0.1.28) precise; urgency=low
 
   * Updating version to build on precise.
 invirt-dev (0.1.28) precise; urgency=low
 
   * Updating version to build on precise.

diff --git a/invirtibuilder b/invirtibuilder
index 598820c..6c0776e 100755 (executable)
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -416,10 +416,7 @@ 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
                     # 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'],
-                              cwd=packagedir)
+                    logAndRun('sbuild', '-s', cwd=packagedir)

 
                     db.failed_stage = 'building binary packages'
                     sbuildAll(package, commit, b.pocketToDistro(pocket), workdir)
 
                     db.failed_stage = 'building binary packages'
                     sbuildAll(package, commit, b.pocketToDistro(pocket), workdir)