diff options
author | Thierry Vignaud <tv@mandriva.org> | 2007-02-22 11:32:00 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2007-02-22 11:32:00 +0000 |
commit | 5f636c6e652a7b13455681e92a5a3b8ad88425e9 (patch) | |
tree | d73049fb2c57f1d40d8f30b1e0b6353527612123 /rpmdrake | |
parent | f18e3eac4782e156ab18f95b47b9000c03f8a80a (diff) | |
download | rpmdrake-5f636c6e652a7b13455681e92a5a3b8ad88425e9.tar rpmdrake-5f636c6e652a7b13455681e92a5a3b8ad88425e9.tar.gz rpmdrake-5f636c6e652a7b13455681e92a5a3b8ad88425e9.tar.bz2 rpmdrake-5f636c6e652a7b13455681e92a5a3b8ad88425e9.tar.xz rpmdrake-5f636c6e652a7b13455681e92a5a3b8ad88425e9.zip |
(Rpmdrake::rpmnew::do_merge_if_needed) move code that lookup *.rpm{new,save} here
Diffstat (limited to 'rpmdrake')
-rwxr-xr-x | rpmdrake | 15 |
1 files changed, 1 insertions, 14 deletions
@@ -540,20 +540,7 @@ sub run_treeview_dialog { # -=-=-=---=-=-=---=-=-=-- main -=-=-=---=-=-=---=-=-=- -if ($options{'merge-all-rpmnew'}) { - my %pkg2rpmnew; - my $wait = wait_msg(N("Please wait, searching...")); - print "Searching .rpmnew and .rpmsave files...\n"; - $db->traverse(sub { - my $n = my_fullname($_[0]); - $pkg2rpmnew{$n} = [ grep { m|^/etc| && (-r "$_.rpmnew" || -r "$_.rpmsave") } map { chomp_($_) } $_[0]->files ]; - }); - print "done.\n"; - undef $wait; - $typical_width = 330; - dialog_rpmnew('', %pkg2rpmnew) and print "Nothing to do.\n"; - myexit(0); -} +do_merge_if_needed(); readconf(); |