Dont create %config backups on skipped files

- This cosmetical only, but there's no point creating the same backup
  twice. Depends on commit f7f5f88f9f.
This commit is contained in:
Panu Matilainen 2012-08-20 11:12:05 +03:00
parent abe15e3a62
commit bfb364563a
2 changed files with 5 additions and 3 deletions

View File

@ -508,6 +508,10 @@ assert(otherFi != NULL);
} }
} }
/* Skipped files dont need fixup size or backups, %config or not */
if (XFA_SKIPPING(rpmfsGetAction(fs, i)))
break;
/* Try to get the disk accounting correct even if a conflict. */ /* Try to get the disk accounting correct even if a conflict. */
fixupSize = rpmfiFSizeIndex(otherFi, otherFileNum); fixupSize = rpmfiFSizeIndex(otherFi, otherFileNum);

View File

@ -542,7 +542,6 @@ AT_CLEANUP
# Shared config(noreplace) variants of the more interesting cases # Shared config(noreplace) variants of the more interesting cases
# ------------------------------ # ------------------------------
# Upgrade package with locally modified config file, changed in pkg. # Upgrade package with locally modified config file, changed in pkg.
# Creating *two* backups makes no sense, but that's what currently happens.
AT_SETUP([upgrade changing, modified shared config(noreplace) 1]) AT_SETUP([upgrade changing, modified shared config(noreplace) 1])
AT_KEYWORDS([install]) AT_KEYWORDS([install])
AT_CHECK([ AT_CHECK([
@ -581,8 +580,7 @@ otherstuff
otherstuff otherstuff
foo-2.0 foo-2.0
], ],
[warning: /etc/my.conf created as /etc/my.conf.rpmnew [warning: /etc/my.conf created as /etc/my.conf.rpmnew]
warning: /etc/my.conf created as /etc/my.conf.rpmnew]
) )
AT_CLEANUP AT_CLEANUP