| commit | af357d6ab00d8ca258dfd7abb689d6fd2eb4090f | |
| author | Dan McGee <dan@archlinux.org> | |
| Thu, 14 Jul 2011 20:32:03 +0000 (14 15:32 -0500) | ||
| committer | Dan McGee <dan@archlinux.org> | |
| Thu, 14 Jul 2011 20:34:04 +0000 (14 15:34 -0500) | ||
| tree | 81218f7e003e71d2d8c7feee6671516865f751d6 | treesnapshot (tar.gz zip) |
| parent | 36e48573ceee0f707de0dcc55d1da442d949d3dc | commitdiff |
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>
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>
| lib/libalpm/add.c | diffblobblamehistory | |
| lib/libalpm/backup.c | diffblobblamehistory | |
| lib/libalpm/backup.h | diffblobblamehistory | |
| lib/libalpm/conflict.c | diffblobblamehistory | |
| lib/libalpm/remove.c | diffblobblamehistory | |
| test/pacman/tests/fileconflict003.py | diffblobblamehistory | |
| test/pacman/tests/upgrade027.py | [new file with mode: 0644] | blob |
| test/pacman/tests/upgrade028.py | [new file with mode: 0644] | blob |
| test/pacman/tests/upgrade029.py | [new file with mode: 0644] | blob |