All pastes #903024 Raw Edit

Miscellany

public diff v1 · immutable
·published 2008-02-13 22:47 UTC
rendered paste body
diff --git a/pactest/pmdb.py b/pactest/pmdb.pyindex af39200..de2e4c9 100755--- a/pactest/pmdb.py+++ b/pactest/pmdb.py@@ -261,6 +261,8 @@ class pmdb:             if pkg.reason:                 data.append(_mksection("REASON", pkg.reason))         else:+            if pkg.getfilename():+                data.append(_mksection("FILENAME", pkg.getfilename()))             if pkg.replaces:                 data.append(_mksection("REPLACES", pkg.replaces))             if pkg.force:diff --git a/pactest/pmpkg.py b/pactest/pmpkg.pyindex 3ee5815..c0b657f 100755--- a/pactest/pmpkg.py+++ b/pactest/pmpkg.py@@ -46,6 +46,7 @@ class pmpkg:         self.size = 0         self.csize = 0         self.reason = 0+        self.filename = ""    # sync only         self.md5sum = ""      # sync only         self.replaces = []    # sync only (will be moved to depends)         self.force = 0        # sync only (will be moved to depends)@@ -95,12 +96,14 @@ class pmpkg:         """         return "%s-%s" % (self.name, self.version) -    def filename(self):+    def getfilename(self):         """File name of a package, including its extension.                  Returns a string formatted as follows: "pkgname-pkgver.PKG_EXT_PKG".         """-        return "%s%s" % (self.fullname(), PM_EXT_PKG)+        if not self.filename:+            self.filename =  "%s%s" % (self.fullname(), PM_EXT_PKG)+        return self.filename      def install_files(self, root):         """Install files in the filesystem located under "root".@@ -115,7 +118,7 @@ class pmpkg:         A package archive is generated in the location 'path', based on the data         from the object.         """-        self.path = os.path.join(path, self.filename())+        self.path = os.path.join(path, self.getfilename())          curdir = os.getcwd()         tmpdir = tempfile.mkdtemp()diff --git a/pactest/pmtest.py b/pactest/pmtest.pyindex be36914..e9db09c 100755--- a/pactest/pmtest.py+++ b/pactest/pmtest.py@@ -127,12 +127,12 @@ class pmtest:         # Creating packages         vprint("    Creating package archives")         for pkg in self.localpkgs:-            vprint("\t%s" % os.path.join(TMPDIR, pkg.filename()))+            vprint("\t%s" % os.path.join(TMPDIR, pkg.getfilename()))             pkg.makepkg(tmpdir)         for key, value in self.db.iteritems():             if key == "local": continue             for pkg in value.pkgs:-                vprint("\t%s" % os.path.join(PM_CACHEDIR, pkg.filename()))+                vprint("\t%s" % os.path.join(PM_CACHEDIR, pkg.getfilename()))                 if self.cachepkgs:                     pkg.makepkg(cachedir)                 else: