diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2012-08-20 12:42:36 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2012-08-20 12:42:36 +0300 |
| commit | 7a50e9de80ab3c47618dad1e9a5b2d9b79bfc8dc (patch) | |
| tree | bd5a7a90afd5be68e1cb858557f94769e67236a9 /tests | |
| parent | 2067c7c0d38eae794c36f598faa227d644e81046 (diff) | |
| download | rpm-7a50e9de80ab3c47618dad1e9a5b2d9b79bfc8dc.tar.gz rpm-7a50e9de80ab3c47618dad1e9a5b2d9b79bfc8dc.tar.bz2 rpm-7a50e9de80ab3c47618dad1e9a5b2d9b79bfc8dc.zip | |
Dont create redundant %config backups when on-disk content is same as new
- When on-disk %config file contents match the contents of the new
package (such as config in old package was buggy, fixed in new
and admin worked around in the meantime) there's no point creating
a backup that's identical to what you already have. Note that
we create the new config anyway instead of skipping as timestamp
might have changed.
- Adjust test-cases to the new saner behavior.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rpmconfig.at | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/tests/rpmconfig.at b/tests/rpmconfig.at index 12728a5b8..bc040509f 100644 --- a/tests/rpmconfig.at +++ b/tests/rpmconfig.at @@ -132,8 +132,7 @@ otherstuff AT_CLEANUP # ------------------------------ -# Modified config file matches the content from new package. Creating a -# backup makes no sense in this case, but that's what currently happens. +# Modified config file matches the content from new package. AT_SETUP([upgrade changing, modified config 2]) AT_KEYWORDS([install]) AT_CHECK([ @@ -162,8 +161,7 @@ cat "${cf}" foo-2.0 foo-2.0 ], -[warning: /etc/my.conf saved as /etc/my.conf.rpmsave] -) +[]) AT_CLEANUP # config(noreplace) variants of the same cases. @@ -303,8 +301,7 @@ foo-2.0 AT_CLEANUP # ------------------------------ -# Modified config file matches the content from new package. Creating a -# backup makes no sense in this case, but that's what currently happens. +# Modified config file matches the content from new package. AT_SETUP([upgrade changing, modified config(noreplace) 2]) AT_KEYWORDS([install]) AT_CHECK([ @@ -334,8 +331,7 @@ cat "${cf}" foo-2.0 foo-2.0 ], -[warning: /etc/my.conf created as /etc/my.conf.rpmnew] -) +[]) AT_CLEANUP # Shared config file variants of the same cases @@ -498,8 +494,7 @@ otherstuff AT_CLEANUP # ------------------------------ -# Modified config file matches the content from new package. Creating a -# backup makes no sense in this case, but that's what currently happens. +# Modified config file matches the content from new package. AT_SETUP([upgrade changing, modified shared config 2]) AT_KEYWORDS([install]) AT_CHECK([ @@ -535,8 +530,7 @@ cat "${cf}" foo-2.0 foo-2.0 ], -[warning: /etc/my.conf saved as /etc/my.conf.rpmsave] -) +[]) AT_CLEANUP # Shared config(noreplace) variants of the more interesting cases @@ -585,8 +579,7 @@ foo-2.0 AT_CLEANUP # ------------------------------ -# Modified config file matches the content from new package. Creating a -# backup makes no sense in this case, but that's what currently happens. +# Modified config file matches the content from new package. AT_SETUP([upgrade changing, modified shared config(noreplace) 2]) AT_KEYWORDS([install]) AT_CHECK([ @@ -623,6 +616,5 @@ cat "${cf}" foo-2.0 foo-2.0 ], -[warning: /etc/my.conf created as /etc/my.conf.rpmnew] -) +[]) AT_CLEANUP |