diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2008-01-05 10:24:45 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-05 16:49:09 -0600 |
| commit | 85a8b150edb7d1fca67f7f0abee3400bd57e7d5a (patch) | |
| tree | 196ee95be6fc28c85a7ab2f76aa086b019bbc2f3 /pactest/tests | |
| parent | 14e4366c781250092a5131b8fbbeda3aab67bd9d (diff) | |
| download | pacman-85a8b150edb7d1fca67f7f0abee3400bd57e7d5a.tar.xz | |
conflict.c : fix for upgrade042.
Thanks to the proactive backup handling, we don't need to add the moving
file to the skip_add list.
The backup handling will make sure nothing gets overwritten.
Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-December/010610.html
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'pactest/tests')
| -rw-r--r-- | pactest/tests/upgrade043.py | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/pactest/tests/upgrade043.py b/pactest/tests/upgrade043.py new file mode 100644 index 00000000..e76dc463 --- /dev/null +++ b/pactest/tests/upgrade043.py @@ -0,0 +1,28 @@ +self.description = "Backup file relocation (reverse order)" + +lp1 = pmpkg("bash") +lp1.files = ["etc/profile*"] +lp1.backup = ["etc/profile"] +self.addpkg2db("local", lp1) + +p1 = pmpkg("bash", "1.0-2") +p1.depends = [ "filesystem" ] +self.addpkg(p1) + +lp2 = pmpkg("filesystem") +self.addpkg2db("local", lp2) + +p2 = pmpkg("filesystem", "1.0-2") +p2.files = ["etc/profile**"] +p2.backup = ["etc/profile"] +self.addpkg(p2) + +self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) + +self.filesystem = ["etc/profile"] + +self.addrule("PKG_VERSION=bash|1.0-2") +self.addrule("PKG_VERSION=filesystem|1.0-2") +self.addrule("!FILE_PACSAVE=etc/profile") +self.addrule("FILE_PACNEW=etc/profile") +self.addrule("FILE_EXIST=etc/profile") |