Merge lp:~james-w/linaro-image-tools/debug into lp:linaro-image-tools/11.11

[James Westby]

Hi,

This adds some output as the tool is running, and also adds a --debug
option that we can add more info to.

Thanks,

James

[Michael Hudson-Doyle (mwhudson)]

Seems basically fine. I'm a bit confused as to what is INFO and what is DEBUG. Would it make sense to have things that happen once per run at INFO and once per package at DEBUG? But I guess it's not that important.

[James Westby (james-w)]

On Fri, 05 Nov 2010 02:07:44 -0000, Michael Hudson-Doyle <email address hidden> wrote:
> Seems basically fine. I'm a bit confused as to what is INFO and what
> is DEBUG. Would it make sense to have things that happen once per run
> at INFO and once per package at DEBUG? But I guess it's not that
> important.

Yeah, I just made some simple ones INFO. I'll spend a few minutes
thinking about the desired output and add that as INFO, and leave the
rest as DEBUG.

Thanks,

James

[Michael Hudson-Doyle (mwhudson)]

Meant to approve it the first time.

review: Approve

=== modified file 'hwpack/__init__.py'
--- hwpack/__init__.py	2010-08-27 18:27:58 +0000
+++ hwpack/__init__.py	2010-11-04 16:16:05 +0000
@@ -0,0 +1,10 @@
+import logging
+
+
+class NullHandler(logging.Handler):
+    def emit(self, record):
+        pass
+
+
+h = NullHandler()
+logging.getLogger(__name__).addHandler(h)

=== modified file 'hwpack/builder.py'
--- hwpack/builder.py	2010-09-14 18:09:01 +0000
+++ hwpack/builder.py	2010-11-04 16:16:05 +0000
@@ -1,3 +1,4 @@
+import logging
 import errno
 
 from hwpack.config import Config
@@ -5,6 +6,9 @@
 from hwpack.packages import PackageFetcher
 
 
+logger = logging.getLogger(__name__)
+
+
 class ConfigFileMissing(Exception):
 
     def __init__(self, filename):
@@ -28,11 +32,13 @@
 
     def build(self):
         for architecture in self.config.architectures:
+            logger.info("Building for %s" % architecture)
             metadata = Metadata.from_config(
                 self.config, self.version, architecture)
             hwpack = HardwarePack(metadata)
             sources = self.config.sources
             hwpack.add_apt_sources(sources)
+            logger.info("Fetching packages")
             fetcher = PackageFetcher(
                 sources.values(), architecture=architecture)
             with fetcher:
@@ -40,6 +46,8 @@
                 packages = fetcher.fetch_packages(
                     self.config.packages,
                     download_content=self.config.include_debs)
+                logger.debug("Adding packages to hwpack")
                 hwpack.add_packages(packages)
                 with open(hwpack.filename(), 'w') as f:
                     hwpack.to_file(f)
+                    logger.info("Wrote %s" % hwpack.filename())

=== modified file 'hwpack/packages.py'
--- hwpack/packages.py	2010-09-24 20:00:05 +0000
+++ hwpack/packages.py	2010-11-04 16:16:05 +0000
@@ -1,3 +1,4 @@
+import logging
 import os
 import shutil
 import tempfile
@@ -7,6 +8,9 @@
 import apt_pkg
 
 
+logger = logging.getLogger(__name__)
+
+
 def get_packages_file(packages, extra_text=None):
     """Get the Packages file contents indexing `packages`.
 
@@ -280,6 +284,7 @@
         of sources.
         """
         self.cleanup()
+        logger.debug("Writing apt configs")
         self.tempdir = tempfile.mkdtemp(prefix="hwpack-apt-cache-")
         dirs = ["var/lib/dpkg",
                 "etc/apt/",
@@ -299,6 +304,7 @@
             with open(apt_conf, 'w') as f:
                 f.write('Apt {\nArchitecture "%s";\n}\n' % self.architecture)
         self.cache = Cache(rootdir=self.tempdir, memonly=True)
+        logger.debug("Updating apt cache")
         self.cache.update()
         self.cache.open()
         return self
@@ -393,6 +399,7 @@
         :param packages: the list of package names to ignore.
         :type packages: an iterable of str
         """
+        logger.debug("Ignoring %s" % packages)
         for package in packages:
             self.cache.cache[package].mark_install(auto_fix=False)
             if self.cache.cache.broken_count:
@@ -411,6 +418,7 @@
             candidate = package.installed
             base = os.path.basename(candidate.filename)
             installed.append(FetchedPackage.from_apt(candidate, base))
+            logger.debug("Ignored %s" % package.name)
         self.cache.set_installed_packages(installed)
         broken = [p.name for p in self.cache.cache
                 if p.is_inst_broken or p.is_now_broken]
@@ -428,6 +436,7 @@
                 seen_packages.add(package.name)
         all_packages = set(package_dict.keys())
         for unseen_package in all_packages.difference(seen_packages):
+            logger.debug("%s is ignored, skipping" % unseen_package)
             del package_dict[unseen_package]
 
     def fetch_packages(self, packages, download_content=True):
@@ -474,6 +483,7 @@
         acq = apt_pkg.Acquire(DummyProgress())
         acqfiles = []
         for package in self.cache.cache.get_changes():
+            logger.debug("Fetching %s" % package)
             candidate = package.candidate
             base = os.path.basename(candidate.filename)
             if package.name not in fetched:

=== modified file 'linaro-hwpack-create'
--- linaro-hwpack-create	2010-09-13 19:15:28 +0000
+++ linaro-hwpack-create	2010-11-04 16:16:05 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import argparse
+import logging
 import sys
 
 from hwpack.builder import ConfigFileMissing, HardwarePackBuilder
@@ -14,7 +15,20 @@
         "from.")
     parser.add_argument(
         "VERSION", help="The version of the hardware pack to create.")
+    parser.add_argument("--debug", action="store_true")
     args = parser.parse_args()
+    ch = logging.StreamHandler()
+    ch.setLevel(logging.INFO)
+    formatter = logging.Formatter("%(message)s")
+    ch.setFormatter(formatter)
+    logger = logging.getLogger("hwpack")
+    logger.setLevel(logging.INFO)
+    logger.addHandler(ch)
+    if args.debug:
+        ch.setLevel(logging.DEBUG)
+        formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+        ch.setFormatter(formatter)
+        logger.setLevel(logging.DEBUG)
     try:
         builder = HardwarePackBuilder(args.CONFIG_FILE, args.VERSION)
     except ConfigFileMissing, e: