--- a/src/client.py	Wed Apr 09 14:41:07 2008 -0700
+++ b/src/client.py	Wed Apr 09 16:14:58 2008 -0700
@@ -595,7 +595,7 @@
                 print "       Version:", version.release
                 print " Build Release:", version.build_release
                 print "        Branch:", version.branch
-                print "Packaging Date:", version.get_datetime().ctime()
+                print "Packaging Date:", version.get_timestamp().ctime()
                 if m.size > (1024 * 1024):
                         print "          Size: %.1f MB" % \
                             (m.size / float(1024 * 1024))

--- a/src/modules/actions/driver.py	Wed Apr 09 14:41:07 2008 -0700
+++ b/src/modules/actions/driver.py	Wed Apr 09 16:14:58 2008 -0700
@@ -579,8 +579,8 @@
                         if len(cp.split()) == 3:
                                 cp = self.attrs["name"] + " " + cp
                         args = (
-                            self.update_drv, "-b", image.get_root(), "-d",
-                            "-m", cp, "clone"
+                            self.update_drv, "-b", pkgplan.image.get_root(),
+                            "-d", "-m", cp, "clone"
                         )
                         retcode = subprocess.call(args)
                         if retcode != 0:

--- a/src/modules/client/image.py	Wed Apr 09 14:41:07 2008 -0700
+++ b/src/modules/client/image.py	Wed Apr 09 16:14:58 2008 -0700
@@ -575,7 +575,7 @@
                         # the authority to record that.
                         auth = flines[0]
                         auth = auth.strip()
-                        newauth = "%s_%s" % (fmri.PREF_AUTH_PFX, auth)
+                        newauth = "%s_%s" % (pkg.fmri.PREF_AUTH_PFX, auth)
 
                 if newauth and not read_only:
                         # This is where we actually update the installed

--- a/src/modules/subprocess_method.py	Wed Apr 09 14:41:07 2008 -0700
+++ b/src/modules/subprocess_method.py	Wed Apr 09 16:14:58 2008 -0700
@@ -328,7 +328,7 @@
 if __name__ == "__main__":
 
         def test(max, foo = ""):
-                import timedanek
+                import time
                 for i in xrange(0, max):
                         print "%s%d" % (foo, i)
                         time.sleep(1)

--- a/src/modules/sysvpkg.py	Wed Apr 09 14:41:07 2008 -0700
+++ b/src/modules/sysvpkg.py	Wed Apr 09 16:14:58 2008 -0700
@@ -192,18 +192,6 @@
 		self.deps = self.readDependFile()
 		self.manifest = self.readPkgmapFile()
 
-        def makePkgVersion(self):
-                """A factory method to spit out a PkgVersion object.
-                """
-                # XXX need a better version here, and the package should be a
-                # pkg: FMRI.
-                pv = PkgVersion(self.pkginfo["PKG"], self.pkginfo["VERSION"])
-
-                pv.set_contents(self.manifest)
-                pv.set_dependencies(self.deps)
-
-                return pv
-
 	def readDependFile(self):
                 # XXX This is obviously bogus, but the dependency information is
                 # in the main archive, which we haven't read in the constructor

--- a/src/modules/updatelog.py	Wed Apr 09 14:41:07 2008 -0700
+++ b/src/modules/updatelog.py	Wed Apr 09 16:14:58 2008 -0700
@@ -24,6 +24,7 @@
 #
 
 import os
+import errno
 import re
 import time
 import datetime

--- a/src/modules/version.py	Wed Apr 09 14:41:07 2008 -0700
+++ b/src/modules/version.py	Wed Apr 09 16:14:58 2008 -0700
@@ -108,7 +108,7 @@
                 return False
 
         def is_same_minor(self, other):
-                if not is_same_major(self, other):
+                if not self.is_same_major(other):
                         return False
 
                 if self.sequence[1] == other.sequence[1]:
@@ -209,7 +209,7 @@
         def set_timestamp(self, timestamp):
                 self.datetime = datetime.datetime.fromtimestamp(timestamp)
 
-        def get_datetime(self):
+        def get_timestamp(self):
                 return self.datetime
 
         def __ne__(self, other):

--- a/src/publish.py	Wed Apr 09 14:41:07 2008 -0700
+++ b/src/publish.py	Wed Apr 09 16:14:58 2008 -0700
@@ -379,7 +379,7 @@
                     _("pkgsend: illegal %s option -- %s") % (subcommand, e.opt)
                 usage()
 
-        sys.exit(0)
+        return 0