diff options
| author | Dan McGee <dan@archlinux.org> | 2008-02-16 02:40:22 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-02-16 02:40:22 +0100 |
| commit | 6b07b5d34512ef361ebf04395f07965cb80d0ec3 (patch) | |
| tree | d67f27a25aeae00dedf5c6fab176576c06d1f5d9 /pactest/tests/upgrade011.py | |
| parent | a16608c6100e8620c03c94e34bb47256c2f5ee32 (diff) | |
| parent | be95e4d8a008662eb0e19a3186953511551acec1 (diff) | |
| download | pacman-6b07b5d34512ef361ebf04395f07965cb80d0ec3.tar.gz pacman-6b07b5d34512ef361ebf04395f07965cb80d0ec3.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/be_files.c
lib/libalpm/package.c
Diffstat (limited to 'pactest/tests/upgrade011.py')
| -rw-r--r-- | pactest/tests/upgrade011.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pactest/tests/upgrade011.py b/pactest/tests/upgrade011.py new file mode 100644 index 00000000..d8ed8734 --- /dev/null +++ b/pactest/tests/upgrade011.py @@ -0,0 +1,16 @@ +self.description = "Upgrade a package with a filesystem conflict" + +p = pmpkg("dummy", "2.0-1") +p.files = ["bin/dummy", "usr/share/file"] +self.addpkg(p) + +lp = pmpkg("dummy", "1.0-1") +lp.files = ["bin/dummy"] +self.addpkg2db("local", lp) + +self.filesystem = ["usr/share/file"] + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_VERSION=dummy|1.0-1") |