Rev 6030: Clean up the warning messages a bit. in http://bazaar.launchpad.net/~jameinel/bzr/2.5-up-to-date-609187

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.5-up-to-date-609187

------------------------------------------------------------
revno: 6030
revision-id: john at arbash-meinel.com-20110718163649-h1m30rojfejn1b19
parent: john at arbash-meinel.com-20110718162248-hulru3k592nqlgho
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.5-up-to-date-609187
timestamp: Mon 2011-07-18 18:36:49 +0200
message:
  Clean up the warning messages a bit.
-------------- next part --------------
=== modified file 'bzrlib/plugins/launchpad/__init__.py'
--- a/bzrlib/plugins/launchpad/__init__.py	2011-07-18 16:22:48 +0000
+++ b/bzrlib/plugins/launchpad/__init__.py	2011-07-18 16:36:49 +0000
@@ -511,20 +511,25 @@
     trace.mutter('LatestPublication.get_latest_version took %.3fs'
                  % (t_latest_ver,))
     if latest_ver is None:
-        trace.note('Could not find a published version for:\n  %s'
-                   % (t, the_branch.base,))
+        trace.note('Could not find a published version for packaging branch:\n'
+                   '  %s' % (the_branch.base,))
         return
     t = time.time()
     tags = the_branch.tags.get_tag_dict()
     t_tag_dict = time.time() - t
-    trace.mutter('LatestPublication get_tag_dict took: %.3fs', t_tag_dict)
+    trace.mutter('LatestPublication get_tag_dict took: %.3fs' % (t_tag_dict,))
     if latest_ver in tags:
-        trace.note('Found most recent published version: %s\n  in %s'
+        trace.note('Found most recent published version: %s'
+                   ' in packaging branch:\n  %s'
                    % (latest_ver, the_branch.base))
     else:
-        trace.warning('Branch not up-to-date. The most recent published'
-                      ' version is %s,\nbut it is not in the branch'
-                      ' tags for:\n  %s' % (latest_ver, the_branch.base))
+        place = archive.title()
+        if series is not None:
+            place = '%s/%s' % (place, series.title())
+        trace.warning(
+            'Packaging branch is not up-to-date. The most recent published\n'
+            'version in %s is %s, but it is not in the branch tags for:\n  %s'
+            % (place, latest_ver, the_branch.base))
 
 def _register_hooks():
     _mod_branch.Branch.hooks.install_named_hook('open',