--- a/usr/src/cmd/distro_const/__init__.py	Thu May 17 10:48:00 2012 -0700
+++ b/usr/src/cmd/distro_const/__init__.py	Thu May 17 11:41:46 2012 -0700
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 """init module for the distribution constructor"""
@@ -36,8 +36,8 @@
 import sys
 import time
 
-import distro_spec
-import execution_checkpoint
+import solaris_install.distro_const.distro_spec
+import solaris_install.distro_const.execution_checkpoint
 
 import osol_install.errsvc as errsvc
 import solaris_install.transfer.info as transfer

--- a/usr/src/cmd/distro_const/checkpoints/boot_archive_archive.py	Thu May 17 10:48:00 2012 -0700
+++ b/usr/src/cmd/distro_const/checkpoints/boot_archive_archive.py	Thu May 17 11:41:46 2012 -0700
@@ -249,8 +249,8 @@
             skip_dirs = list()
             for d in dirs:
                 if os.path.join(root, d) in exclude_dirs:
-                    self.logger.debug("adding %s to directory skip list due"
-                                      " to exclude list", os.path.join(root, d))
+                    self.logger.debug("adding %s to directory skip list due to"
+                                      " exclude list", os.path.join(root, d))
                     skip_dirs.append(d)
             for sd in skip_dirs:
                 dirs.remove(sd)

--- a/usr/src/cmd/distro_const/distro_spec.py	Thu May 17 10:48:00 2012 -0700
+++ b/usr/src/cmd/distro_const/distro_spec.py	Thu May 17 11:41:46 2012 -0700
@@ -24,6 +24,13 @@
 # Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
+""" distro_spec
+
+ Distro object class for handling the <distro> elements
+ in the manifest.
+
+"""
+
 import sys
 
 from lxml import etree
@@ -32,13 +39,6 @@
 from solaris_install.data_object.cache import DataObjectCache
 from solaris_install.data_object.simple import SimpleXmlHandlerBase
 
-""" distro_spec
-
- Distro object class for handling the <distro> elements
- in the manifest.
-
-"""
-
 
 class Distro(SimpleXmlHandlerBase):
     TAG_NAME = "distro"

--- a/usr/src/cmd/distro_const/execution_checkpoint.py	Thu May 17 10:48:00 2012 -0700
+++ b/usr/src/cmd/distro_const/execution_checkpoint.py	Thu May 17 11:41:46 2012 -0700
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 """ execution_checkpoint
@@ -35,7 +35,6 @@
 
 from lxml import etree
 
-from solaris_install.data_object import DataObject, ParsingError
 from solaris_install.data_object.cache import DataObjectCache
 from solaris_install.data_object.simple import SimpleXmlHandlerBase
 

--- a/usr/src/lib/install_transfer/ips.py	Thu May 17 10:48:00 2012 -0700
+++ b/usr/src/lib/install_transfer/ips.py	Thu May 17 11:41:46 2012 -0700
@@ -428,9 +428,9 @@
             self.check_cancel_event()
 
         except api_errors.CatalogRefreshException, cre:
-            '''Handle CatalogRefreshException especially since it doesn't
-               pretty-print it's contents in a __str__() impl.
-            '''
+            #  Handle CatalogRefreshException especially since it doesn't
+            #  pretty-print it's contents in a __str__() impl.
+            
             raise RuntimeError(self.catalog_failures_to_str(cre))
         finally:
             self._cleanup()