diff options
author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2014-10-23 08:54:50 +0200 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2014-11-04 11:11:18 +0100 |
commit | 8cd41ec62bb081c8cdedafab2a96166d861939b5 (patch) | |
tree | b96297cafbfffa7e445111206113c0fe621d00d9 /test/scripts | |
parent | 4114e25df15a3f98bdd6f2d8e86996f1f8f04100 (diff) | |
download | pacman-8cd41ec62bb081c8cdedafab2a96166d861939b5.tar.gz pacman-8cd41ec62bb081c8cdedafab2a96166d861939b5.tar.xz |
tests/pacman-db-upgrade-v9: set additional paths
--config does not respect root, causing pacman-db-upgrade to read the
local pacman.conf rather than the one in the test root.
Also add a rule to ensure the ALPM_DB_VERSION file is actually being
created.
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test/scripts')
-rw-r--r-- | test/scripts/pacman-db-upgrade-v9.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/scripts/pacman-db-upgrade-v9.py b/test/scripts/pacman-db-upgrade-v9.py index dc6f97d6..a54319ff 100644 --- a/test/scripts/pacman-db-upgrade-v9.py +++ b/test/scripts/pacman-db-upgrade-v9.py @@ -9,9 +9,13 @@ fpkg.backup = ["mnt/foo"] self.addpkg2db("local", fpkg) self.dbver = 8 -self.cmd = ["pacman-db-upgrade", "--root", self.root + "/"] +self.cmd = ["pacman-db-upgrade", + "--root", self.rootdir(), + "--dbpath", self.dbdir(), + "--config", self.configfile() ] self.addrule("PACMAN_RETCODE=0") +self.addrule("FILE_EXIST=var/lib/pacman/local/ALPM_DB_VERSION") self.addrule("PKG_BACKUP=filesystem|mnt_real/subdir/foo") self.addrule("PKG_FILES=filesystem|mnt_real/") self.addrule("PKG_FILES=filesystem|mnt_real/subdir/") |