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/upgrade041.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/upgrade041.py')
| -rw-r--r-- | pactest/tests/upgrade041.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pactest/tests/upgrade041.py b/pactest/tests/upgrade041.py index 347c2c4b..20da4f14 100644 --- a/pactest/tests/upgrade041.py +++ b/pactest/tests/upgrade041.py @@ -4,7 +4,7 @@ lp1 = pmpkg("dummy") lp1.files = ["bin/dummy"] lp2 = pmpkg("foobar") -lp2.files = ["bin/foobar" +lp2.files = ["bin/foobar", "usr/share/file"] for p in lp1, lp2: @@ -27,4 +27,5 @@ for p in p1, p2: self.addrule("PKG_EXIST=%s" % p.name) self.addrule("FILE_MODIFIED=bin/dummy") self.addrule("FILE_MODIFIED=bin/foobar") +self.addrule("FILE_EXIST=usr/share/file") self.addrule("FILE_MODIFIED=usr/share/file") |