diff options
| author | Dan McGee <dan@archlinux.org> | 2011-07-14 22:32:03 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-07-14 22:34:04 +0200 |
| commit | af357d6ab00d8ca258dfd7abb689d6fd2eb4090f (patch) | |
| tree | 81218f7e003e71d2d8c7feee6671516865f751d6 /test/pacman/tests/fileconflict003.py | |
| parent | 36e48573ceee0f707de0dcc55d1da442d949d3dc (diff) | |
| download | pacman-af357d6ab00d8ca258dfd7abb689d6fd2eb4090f.tar.gz pacman-af357d6ab00d8ca258dfd7abb689d6fd2eb4090f.tar.xz | |
Allow fileconflict if unowned file moving into backup array
The bulk of this commit is adding new tests to ensure the new behavior
works without disrupting old behavior. This is a relatively sane maneuver
when a package adds a conf file (e.g. '/etc/mercurial/hgrc') that was
not previously in the package, but it is placed in the backup array. In
essence, we can treat the existing file as having always been a part of
the package and do our normal compare/install as pacnew logic checks.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'test/pacman/tests/fileconflict003.py')
| -rw-r--r-- | test/pacman/tests/fileconflict003.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/pacman/tests/fileconflict003.py b/test/pacman/tests/fileconflict003.py index 89696fcb..749e5a99 100644 --- a/test/pacman/tests/fileconflict003.py +++ b/test/pacman/tests/fileconflict003.py @@ -1,4 +1,4 @@ -self.description = "FS#8156" +self.description = "FS#8156- conflict between directory and incoming symlink" p1 = pmpkg("pkg1") p1.files = ["test/", |