Merge lp:~robru/cupstream2distro/more-verbose-publishing into lp:cupstream2distro

[Robert Bruce Park]

Increase logging for publisher job.

[Robert Bruce Park (robru)]

No semantic changes, only adds logging statements, tests pass locally.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:864
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/410/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/410/rebuild

review: Approve (continuous-integration)

=== modified file 'citrain/publisher.py'
--- citrain/publisher.py	2014-12-23 05:35:39 +0000
+++ citrain/publisher.py	2015-02-02 19:36:34 +0000
@@ -128,7 +128,7 @@
     def write(self):
         filename = self.FILENAME_FORMAT.format(self.silo, env.SERIES)
         filepath = os_path_join_safe(SILO_DIR(), filename)
-        logging.info('Writing packagelist for rsync')
+        logging.info('Writing packagelist for rsync.')
         log_value_of.filepath()
         logging.debug('\n' + ''.join(self.lines))
         with open(filepath, 'w') as f:
@@ -138,6 +138,8 @@
 def get_distro_and_series(series_link):
     """Parse the distro and series name from a series link."""
     env.DISTRO, env.SERIES = series_link.split('/')[-2:]
+    logging.info('Found distro {} and series {} in link {}.'.format(
+        env.DISTRO, env.SERIES, series_link))
 
 
 def prevent_duplicate_publishing(is_publishing):
@@ -153,6 +155,7 @@
     msg = 'Version of {} at dest changed from {} to {} since packages built.'
     get_dest_version = packagemanager.get_current_version_for_series
     if env.IGNORE_VERSIONDESTINATION != 'true':
+        logging.info('Checking versions at destination are what we expect...')
         if lp.is_distro_archive(dest):
             for source in source_names:
                 version = get_dest_version(source, env.SERIES, dest=dest)
@@ -166,6 +169,7 @@
 def check_for_unapproved(mps, lp_load):
     """Potentially raise an error if we have some unapproved merges."""
     if env.ALLOW_UNAPPROVED != 'true':
+        logging.info('Checking that all merges are approved...')
         unapproved = []
         for source in mps:
             for mp_link in mps[source]:
@@ -202,7 +206,7 @@
             logging.error('Packaging changes found: {}'.format(basename))
         if diffs:
             generate_xml_artifacts(diffs)
-            raise PublishError('Packaging changes need manual ACKing')
+            raise PublishError('Packaging changes need manual ACKing.')
     else:
         logging.warning('Honoring your request to ACK packaging changes.')
 
@@ -251,7 +255,10 @@
 
 def copy_to_dest(sources, dest, target_pocket='Release'):
     """Binary-copy a package to the given dest archive."""
+    logging.info('Copying sources directly to destination...')
     for source in sources:
+        logging.info('Copying {} {} to {}.'.format(
+            source.source_package_name, source.source_package_version, dest))
         series = source.distro_series_link.split('/')[-1]
         dest.copyPackage(
             from_archive=source.archive_link,