Merge lp:~jameinel/bzr-builddeb/import-scripts-updates2 into lp:~james-w/bzr-builddeb/import-scripts

[John A Meinel]

[John A Meinel (jameinel)]

This adds some small tweaking to the import_package.py script. Probably needs some direct comments about what we should keep, but it was useful for me when trying to get started and debug what was going on.

  312 John Arbash Meinel 2010-02-17
      Several small updates.
      1) handle when madison-lite is not installed more gracefully
      2) enable_default_logging() before loading plugins, in case something fails to load.
      3) allow passing -Dxxx flags for bzrlib to use for debugging (like -Dhttp, -Derror, and -Dhpss)

This is currently committed on top of import-scripts-updates, but I can pull them back apart, there isn't a code-level dependency.

=== modified file 'import_package.py'
--- import_package.py	2010-02-12 21:51:28 +0000
+++ import_package.py	2010-02-17 21:05:27 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import datetime
+import errno
 import operator
 import optparse
 import os
@@ -17,10 +18,15 @@
 
 from launchpadlib.errors import HTTPError
 
-from bzrlib import branch, bzrdir, errors, merge, tag, trace, transport, ui, urlutils
+from bzrlib import branch, bzrdir, debug, errors, merge, tag, trace, transport, ui, urlutils
 from bzrlib.plugin import load_plugins
-from bzrlib.trace import mutter, log_exception_quietly
+from bzrlib.trace import mutter, log_exception_quietly, enable_default_logging
 
+# We may not want to do this, but if there is a failure while loading plugins,
+# it is the only way to find out. One option would be to call
+# 'trace.pop_log_file()' immediately after loading plugins.
+enable_default_logging()
+mutter('import_package started w/ args: %r' % (sys.argv,))
 load_plugins()
 
 from bzrlib.plugins.builddeb import import_dsc
@@ -166,8 +172,15 @@
                 pocket)
         vlist.add_if_needed(newp)
     update_lists()
-    proc = subprocess.Popen(["/usr/bin/madison-lite", "--mirror", icommon.lists_dir,
-            package], stdout=subprocess.PIPE, preexec_fn=subprocess_setup)
+    try:
+        proc = subprocess.Popen(["/usr/bin/madison-lite", "--mirror", icommon.lists_dir,
+                package], stdout=subprocess.PIPE, preexec_fn=subprocess_setup)
+    except OSError, e:
+        if e.errno in (errno.ENOENT,):
+            sys.stderr.write('You must have "madison-lite" installed.\n'
+                             'try: sudo apt-get install madison-lite.\n')
+            sys.exit(1)
+        raise
     output, errout = proc.communicate()
     assert proc.returncode == 0, "Error running madison-lite"
     for line in output.splitlines():
@@ -764,10 +777,11 @@
             newdir = format.initialize_on_transport(to_transport)
             repo = newdir.create_repository(shared=True)
             repo.set_make_working_trees(True)
+            mutter("finding all versions of %s" % (package,))
             versions = get_versions(package, extra_debian=extra_debian)
             assert len(versions.plist) > 0
             versions.reverse()
-            mutter(str(versions))
+            mutter("found %d versions: %s" % (len(versions.plist), versions))
             possible_transports = []
             versions = find_unimported_versions(temp_dir, versions, package,
                     revid_db, bstore, possible_transports=possible_transports)
@@ -825,12 +839,18 @@
 parser.add_option("--no-existing", dest="no_existing", action="store_true")
 parser.add_option("--extra-debian", dest="extra_debian")
 parser.add_option("--verbose", dest="verbose", action="store_true")
+parser.add_option("-D", dest="debug_flags", action="append", default=[],
+                  help="Set debug flags, see 'bzr help debug-flags'")
 
 options, args = parser.parse_args()
 
 if options.verbose:
     trace.set_verbosity_level(1)
     trace.push_log_file(sys.stderr)
+if sys.stderr.isatty():
+    # Don't create a progress bar if we aren't actually in a terminal
+    ui.ui_factory = ui.make_ui_for_terminal(sys.stdin, sys.stdout, sys.stderr)
+debug.debug_flags.update(options.debug_flags)
 
 
 if len(args) < 1: