summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2010-06-04 00:10:50 +1000
committerDan McGee <dan@archlinux.org>2010-07-07 07:25:55 -0500
commit68dcabdfbeadc43c74eccf395a9f04565c5d682e (patch)
treefac209275fe38058b97f8b896581ab5b560a4f32 /test
parent60de8ec932984f1374501c3f11ad1bcfba5c7d5c (diff)
downloadpacman-68dcabdfbeadc43c74eccf395a9f04565c5d682e.tar.xz
Remove DBEXT usage
With commit 5dffef78, the repo database always has a symlink of the form reponame.db. Use that filename and let libarchive determine the compression type. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'test')
-rwxr-xr-xtest/pacman/pmdb.py2
-rwxr-xr-xtest/pacman/pmtest.py2
-rwxr-xr-xtest/pacman/util.py1
3 files changed, 2 insertions, 3 deletions
diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py
index 8cb1b832..41bd7384 100755
--- a/test/pacman/pmdb.py
+++ b/test/pacman/pmdb.py
@@ -344,7 +344,7 @@ class pmdb:
# Generate database archive
mkdir(path)
- archive = os.path.join(path, "%s%s" % (self.treename, PM_EXT_DB))
+ archive = os.path.join(path, "%s.db" % (self.treename))
tar = tarfile.open(archive, "w:gz")
for root, dirs, files in os.walk('.'):
for d in dirs:
diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py
index f2b96760..b1d778e1 100755
--- a/test/pacman/pmtest.py
+++ b/test/pacman/pmtest.py
@@ -149,7 +149,7 @@ class pmtest:
vprint(" Creating sync database archives")
for key, value in self.db.iteritems():
if key == "local": continue
- archive = value.treename + PM_EXT_DB
+ archive = value.treename + ".db"
vprint("\t" + os.path.join(SYNCREPO, archive))
value.gensync(os.path.join(syncdir, value.treename))
diff --git a/test/pacman/util.py b/test/pacman/util.py
index e01a3b8f..657230ee 100755
--- a/test/pacman/util.py
+++ b/test/pacman/util.py
@@ -28,7 +28,6 @@ PM_DBPATH = "var/lib/pacman"
PM_LOCK = "var/lib/pacman/db.lck"
PM_CACHEDIR = "var/cache/pacman/pkg"
PM_EXT_PKG = ".pkg.tar.gz"
-PM_EXT_DB = ".db.tar.gz"
PM_PACNEW = ".pacnew"
PM_PACORIG = ".pacorig"
PM_PACSAVE = ".pacsave"