Merge lp:~jml/pkgme/rollback-r121 into lp:pkgme

[Jonathan Lange]

Rollback r121, as it is breaking nagios checks on staging

Our staging end-to-end checks are failing with the following error (lightly formatted by me)

liam@emim:/etc/nagios/nrpe.d$ /usr/local/lib/nagios/plugins/check_pkgme_e2e.sh /srv/pkgme-service-staging.canonical.com/staging/pkgme-service /srv/pkgme-service-staging.canonical.com/var/nagios/pkgme-e2e.out
Check failed in 8.129219: Failed to build package:
    debuild --no-lintian -S -uc -us failed with returncode 29. Output:
   | sh: 1: gcc: not found
   | dpkg-architecture: warning: Couldn't determine gcc system type, falling back to default (native compilation)
   | dpkg-buildpackage -rfakeroot -d -us -uc -S
   | dpkg-buildpackage: export CFLAGS from dpkg-buildflags (origin: vendor): -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security
   | dpkg-buildpackage: export CPPFLAGS from dpkg-buildflags (origin: vendor): -D_FORTIFY_SOURCE=2
   | dpkg-buildpackage: export CXXFLAGS from dpkg-buildflags (origin: vendor): -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security
   | dpkg-buildpackage: export FFLAGS from dpkg-buildflags (origin: vendor): -g -O2
   | dpkg-buildpackage: export LDFLAGS from dpkg-buildflags (origin: vendor): -Wl,-Bsymbolic-functions -Wl,-z,relro
   | dpkg-buildpackage: source package jabberwocky
   | dpkg-buildpackage: source version 0
   | dpkg-buildpackage: source changed by pkgme-service bot <email address hidden>
   | sh: 1: gcc: not found
   | dpkg-architecture: warning: Couldn't determine gcc system type, falling back to default (native compilation)
   | dpkg-source --before-build jabberwocky
   | fakeroot debian/rules clean
   | dh clean
   | dh_testdir
   | dh_auto_clean
   | sh: 1: gcc: not found
   | dpkg-architecture: warning: Couldn't determine gcc system type, falling back to default (native compilation)
   | dh_clean
   | dpkg-source -b jabberwocky
   | dpkg-source: error: can't build with source format '3.0 (quilt)': no upstream tarball found at ../jabberwocky_0.orig.tar.{bz2,gz,lzma,xz}
   | dpkg-buildpackage: error: dpkg-source -b jabberwocky gave error exit status 255
   | debuild: fatal error at line 1350:
   | dpkg-buildpackage -rfakeroot -d -us -uc -S failed

   Other data: {u'dependencies': [], u'packaged_app_url': None, u'pkgme_distro_arch_series': [], u'pkgme_extra_data': {u'executable': None}}

This branch rolls back the latest changes to pkgme in the hope that it will fix this error.

jml

[James Westby (james-w)]

review: Approve

[James Westby (james-w)]

pkgme-service doesn't use the functions to build a package, just the ones to
write the packaging, then it builds the package itself.

Therefore I think this needs to be landed with a change to pkgme-service
to also call the new build_orig_tar_gz function.

Thanks,

James

[Jonathan Lange (jml)]

Oh, also, to make sure this can't happen again, either:
  a) add an acceptance test, somewhere
  b) do the Continuous Deployment stuff James & I have planned.

=== modified file 'pkgme/bin/main.py'
--- pkgme/bin/main.py	2012-07-19 18:24:55 +0000
+++ pkgme/bin/main.py	2012-07-20 13:18:21 +0000
@@ -11,10 +11,7 @@
     get_backend_selector,
     get_default_loader,
     )
-from pkgme.debuild import (
-    build_orig_tar_gz,
-    build_source_package,
-    )
+from pkgme.debuild import build_source_package
 from pkgme.upload import (
     InvalidPPAName,
     parse_ppa_name,
@@ -138,7 +135,6 @@
                     sign = None
                 else:
                     sign = not options.nosign
-                build_orig_tar_gz(target_dir)
                 build_package(
                     target_dir, interactive=interactive, ppa=options.ppa,
                     sign=sign)

=== modified file 'pkgme/debuild.py'
--- pkgme/debuild.py	2012-07-20 05:24:05 +0000
+++ pkgme/debuild.py	2012-07-20 13:18:21 +0000
@@ -1,8 +1,6 @@
 import os
 import re
 
-from debian.changelog import Changelog
-
 from pkgme.run_script import run_subprocess
 
 
@@ -16,35 +14,9 @@
 
 
 def build_source_package(directory, sign=True):
-    """Build a source package using debuild"""
     cmd = ['debuild', '--no-lintian', '-S']
     if not sign:
         cmd.extend(['-uc', '-us'])
     output = run_subprocess(cmd, cwd=directory)
     changes_file = find_changes_file(output)
     return os.path.abspath(os.path.join(directory, changes_file))
-
-
-def build_orig_tar_gz(target_dir):
-    """Build a pkgname_version.orig.tar.gz from the target_dir
-
-    Note that this will expect a debian/ directory in the target_dir
-    to gather pkgname/version but it will (of course) exclude debian/
-    from the resulting .orig.tar.gz
-    """
-    changelog = Changelog(
-        open(os.path.join(target_dir, "debian", "changelog")))
-    pkgname = changelog.get_package()
-    version = changelog.get_version()
-    target_file = os.path.join(
-        target_dir, "..", "%s_%s.orig.tar.gz" % (pkgname, version))
-    cmd = ["tar", 
-           "-c", 
-           "-z",
-           "--exclude", "debian",
-           "--transform", "s,.,%s-%s," % (pkgname, version),
-           "-f", target_file,
-           ".",
-           ]
-    run_subprocess(cmd, cwd=target_dir)
-    return target_file

=== modified file 'pkgme/package_files.py'
--- pkgme/package_files.py	2012-07-20 05:28:38 +0000
+++ pkgme/package_files.py	2012-07-20 13:18:21 +0000
@@ -249,7 +249,7 @@
     filename = "source/format"
 
     def get_contents(self):
-        return "3.0 (quilt)\n"
+        return "1.0\n"
 
 
 default_package_file_group.add_file_cls(SourceFormat)

=== removed file 'pkgme/tests/test_debuild.py'
--- pkgme/tests/test_debuild.py	2012-07-20 05:24:05 +0000
+++ pkgme/tests/test_debuild.py	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-import os
-import tarfile
-
-from testtools import TestCase
-
-from pkgme.debuild import build_orig_tar_gz
-from pkgme.testing import (
-    TempdirFixture,
-    )
-
-class DebuildTestCase(TestCase):
-
-    def test_build_orig_tar_gz(self):
-        tempdir = self.useFixture(TempdirFixture())
-        pkgdir = os.path.join(tempdir.path, "testpkg")
-        # setup fake env
-        os.makedirs(os.path.join(pkgdir, "debian"))
-        changelog_path = os.path.join(pkgdir, "debian", "changelog")
-        with open(changelog_path, "w") as f:
-            f.write("""
-testpkg (0.1) unstable; urgency=low
-
-  * some changes
-
- -- Some Guy <[e-mail]>  Thu, 19 Apr 2012 10:53:30 +0200
-""")
-        with open(os.path.join(pkgdir, "canary"), "w") as f:
-            f.write("pieep")
-        # build it
-        result_path = build_orig_tar_gz(pkgdir)
-        # verify
-        self.assertEqual(
-            "testpkg_0.1.orig.tar.gz", os.path.basename(result_path))
-        with tarfile.open(result_path) as f:
-            self.assertEqual(
-                ["testpkg-0.1", "testpkg-0.1/canary"], 
-                [m.name for m in f.getmembers()])
-

=== modified file 'pkgme/tests/test_package_files.py'
--- pkgme/tests/test_package_files.py	2012-07-20 05:28:38 +0000
+++ pkgme/tests/test_package_files.py	2012-07-20 13:18:21 +0000
@@ -444,7 +444,7 @@
 
     def test_contents(self):
         package_file = self.get_object()
-        self.assertEqual("3.0 (quilt)\n", package_file.get_contents())
+        self.assertEqual("1.0\n", package_file.get_contents())
 
     def test_overwrite(self):
         package_file = self.get_object()

=== modified file 'pkgme/tests/test_script.py'
--- pkgme/tests/test_script.py	2012-07-20 05:28:38 +0000
+++ pkgme/tests/test_script.py	2012-07-20 13:18:21 +0000
@@ -73,8 +73,7 @@
         self.create_marker_file(tempdir, prefix="foo")
         self.run_script(tempdir.abspath('foo'))
         self.assertThat(tempdir.path, DirContains(
-            ["foo_0.0.0.orig.tar.gz",
-             "foo_0.0.0.debian.tar.gz",
+            ["foo_0.0.0.tar.gz",
              "foo_0.0.0.dsc",
              "foo_0.0.0_source.build",
              "foo_0.0.0_source.changes",