Merge lp:~jml/pkgme-service/pass-maintainer-through into lp:pkgme-service

[Jonathan Lange]

Set the maintainer in the config and pass that through to pkgme-binary, thus setting the maintainer in generated changelogs.

Does what https://code.launchpad.net/~jml/pkgme-service/set-debemail/+merge/99305 does except by setting the maintainer via the metadata rather than an environment variable.

Relies on https://code.launchpad.net/~jml/pkgme-binary/maintainer-from-metadata/+merge/99358

[James Westby (james-w)]

review: Approve

[Canonical CA Tarmac (ca-tarmac)]

Attempt to merge into lp:pkgme-service failed due to conflicts:

text conflict in django_project/main.cfg
text conflict in django_project/schema.py

[lp:~jml/pkgme-service/pass-maintainer-through]

82. By Jonathan Lange on 2012-03-27

Merge trunk, resolving conflicts.

=== modified file 'django_project/main.cfg'
--- django_project/main.cfg	2012-03-26 18:01:53 +0000
+++ django_project/main.cfg	2012-03-27 09:28:19 +0000
@@ -2,6 +2,7 @@
 myapps_realm = Pkgme
 pkgme_allowed_backends = binary
                          pdf
+pkgme_maintainer_email = pkgme-service bot <[e-mail]>
 pkgme_output_directory = packaged-tarballs
 
 [celery]

=== modified file 'django_project/schema.py'
--- django_project/schema.py	2012-03-26 18:01:53 +0000
+++ django_project/schema.py	2012-03-27 09:28:19 +0000
@@ -29,6 +29,7 @@
         myapps_token_secret = schema.StringOption()
         myapps_base_url = schema.StringOption()
         pkgme_allowed_backends = schema.ListOption(item=schema.StringOption())
+        pkgme_maintainer_email = schema.StringOption()
         pkgme_output_directory = schema.StringOption()
         pkgme_output_url = schema.StringOption()
         extra_installed_apps = schema.ListOption(item=schema.StringOption())

=== modified file 'src/djpkgme/tasks.py'
--- src/djpkgme/tasks.py	2012-03-27 09:20:29 +0000
+++ src/djpkgme/tasks.py	2012-03-27 09:28:19 +0000
@@ -328,6 +328,9 @@
         # The contents of $output_dir (i.e. the source package files and
         # devportal-metadata.json) are tarred up and stored in a preconfigured
         # location: PKGME_OUTPUT_DIRECTORY.
+        debemail = settings.PKGME_MAINTAINER_EMAIL
+        if debemail:
+            metadata[MetadataBackend.MAINTAINER] = debemail
         with TempDir() as temp_dir:
             output_dir = temp_dir.path
             download_dir = os.path.join(

=== modified file 'src/djpkgme/tests/test_integration.py'
--- src/djpkgme/tests/test_integration.py	2012-03-05 11:07:58 +0000
+++ src/djpkgme/tests/test_integration.py	2012-03-27 09:28:19 +0000
@@ -15,7 +15,6 @@
     TempDir,
     )
 from pkgme.run_script import ScriptFailed
-from testtools import run_test_with
 from testtools.content import (
     Content,
     text_content,

=== modified file 'src/djpkgme/tests/test_tasks.py'
--- src/djpkgme/tests/test_tasks.py	2012-03-26 18:21:44 +0000
+++ src/djpkgme/tests/test_tasks.py	2012-03-27 09:28:19 +0000
@@ -8,6 +8,10 @@
 import tarfile
 import traceback
 
+# In lucid, python-debian exports its package as 'debian_bundle'.
+from testtools import try_imports
+changelog = try_imports(['debian.changelog', 'debian_bundle.changelog'])
+
 from devportalbinary.metadata import MetadataBackend
 from django.conf import settings
 from fixtures import TempDir
@@ -620,3 +624,29 @@
         basename = os.path.basename(output_tar_path)
         cleaned_package_name = PackageName.clean(name)
         self.assertEqual("%s.tar.gz" % cleaned_package_name, basename)
+
+    def test_uses_pkgme_maintainer_email(self):
+        unpack_dir = self.useFixture(TempDir()).path
+        metadata = self.factory.make_metadata()
+        debemail = 'Dude <[e-mail]>'
+        with patch_settings(PKGME_MAINTAINER_EMAIL=debemail):
+            output_tar_path = self.run_task(
+                metadata, self.factory.make_packagable_tarball())
+        output_tar = tarfile.open(output_tar_path, 'r:gz')
+        try:
+            output_tar.extractall(unpack_dir)
+        finally:
+            output_tar.close()
+        package_name = metadata['package_name']
+        package_tarball_path = os.path.join(
+            unpack_dir, '%s_0.tar.gz' % (package_name,))
+        t = tarfile.open(package_tarball_path)
+        try:
+            t.extractall(unpack_dir)
+        finally:
+            t.close()
+        debian_dir = os.path.join(unpack_dir, package_name, 'debian')
+        changelog_path = os.path.join(debian_dir, 'changelog')
+        cl = changelog.Changelog(open(changelog_path).read())
+        [change_block] = list(cl)
+        self.assertEqual(debemail, change_block.author)