Merge lp:~brian-murray/ubuntu-archive-tools/identify-security into lp:ubuntu-archive-tools

[Brian Murray]

Identify security updates in the fully phased report by appending (security) after the version.

=== modified file 'phased-updater'
--- phased-updater	2013-08-19 19:39:39 +0000
+++ phased-updater	2013-08-20 21:36:23 +0000
@@ -137,6 +137,16 @@
             for pub_source in buckets[rname]:
                 pkg = pub_source.source_package_name
                 version = pub_source.source_package_version
+                # Identify security updates
+                if options.fully_phased:
+                    sec_pubs = [(ps.source_package_name,
+                                 ps.source_package_version)
+                                for ps in archive.getPublishedSources(
+                                distro_series=release, pocket='Security',
+                                source_name=pkg, version=version,
+                                exact_match=True)]
+                    if (pkg, version) in sec_pubs:
+                        version += ' (security)'
                 age = (datetime.datetime.now() -
                        pub_source.date_published.replace(tzinfo=None)).days
                 update_percentage = buckets[rname][pub_source].get('pup', 100)
@@ -418,8 +428,6 @@
     #  TODO: make email code less redundant
     #  TODO: modify HTTP_USER_AGENT (both versions of urllib)
     #  TODO: Open bugs for regressions when false positives reduced
-    ubuntu = launchpad.distributions['ubuntu']
-    archive = ubuntu.getArchive(name='primary')
     options.archive = archive
 
     overrides = defaultdict(list)
@@ -551,12 +559,17 @@
     options, args = parser.parse_args()
     if options.launchpad_instance != 'production':
         LP_BASE_URL = 'https://%s.launchpad.net' % options.launchpad_instance
+    if options.email and options.fully_phased:
+        parser.error("Sending emails and fully phased updates are mutually \
+exclusive.")
     launchpad = Launchpad.login_with(
         'phased-updater', options.launchpad_instance, version='devel')
     logging.basicConfig(filename='phased-updates.log',
                         format='%(asctime)s - %(levelname)s - %(message)s',
                         level=logging.INFO)
     logging.info('Starting phased-updater')
+    ubuntu = launchpad.distributions['ubuntu']
+    archive = ubuntu.getArchive(name='primary')
     main()
     end_time = time.time()
     logging.info("Elapsed time was %g seconds" % (end_time - start_time))