libalpm/add.c: fix backup array issue

As seen with the recent upgrade of pacman and the removal of the
pacman.d/current mirrorlist, files that were formerly in the backup array
get deleted upon their removal, which could be dangerous. Instead, we should
use the combined backup array of the old and new package. This fix should
address this issue in a relatively straightforward way.

In addition, old files should be moved to pacsave locations as expected.

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 1 insertions, 0 deletions

diff --git a/pactest/tests/upgrade025.py b/pactest/tests/upgrade025.py
index b78a2dd1..2c9c06f3 100644
--- a/pactest/tests/upgrade025.py
+++ b/pactest/tests/upgrade025.py
@@ -13,4 +13,5 @@ self.args = "-U %s" % p.filename()
 
 self.addrule("PKG_VERSION=dummy|1.0-2")
 self.addrule("FILE_PACSAVE=etc/dummy.conf")
+self.addrule("!FILE_PACNEW=etc/dummy.conf")
 self.addrule("FILE_EXIST=etc/dummy.conf")