diff options
author | Angelo Naselli <anaselli@linux.it> | 2014-12-02 19:51:01 +0100 |
---|---|---|
committer | Angelo Naselli <anaselli@linux.it> | 2014-12-02 19:51:01 +0100 |
commit | 45f74a345d3539b679bf1ac681812137ad85fffe (patch) | |
tree | 3ee00085d56df7f228c66cdb9ed5331a04391eaf | |
parent | 697ac4014d834baa023daffc75a3f0d2ae871d92 (diff) | |
download | colin-keep-45f74a345d3539b679bf1ac681812137ad85fffe.tar colin-keep-45f74a345d3539b679bf1ac681812137ad85fffe.tar.gz colin-keep-45f74a345d3539b679bf1ac681812137ad85fffe.tar.bz2 colin-keep-45f74a345d3539b679bf1ac681812137ad85fffe.tar.xz colin-keep-45f74a345d3539b679bf1ac681812137ad85fffe.zip |
- Quit only if really wanted
- removed BP
-rw-r--r-- | lib/AdminPanel/Rpmdragora/gui.pm | 4 | ||||
-rw-r--r-- | lib/AdminPanel/Rpmdragora/pkg.pm | 2 | ||||
-rwxr-xr-x | modules/rpmdragora/rpmdragora | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/lib/AdminPanel/Rpmdragora/gui.pm b/lib/AdminPanel/Rpmdragora/gui.pm index f8fc396..92851ce 100644 --- a/lib/AdminPanel/Rpmdragora/gui.pm +++ b/lib/AdminPanel/Rpmdragora/gui.pm @@ -1001,7 +1001,6 @@ sub ask_browse_tree_given_widgets_for_rpmdragora { carp "TODO ==================> ADD NODES - add packages (" . scalar(@nodes) . ") \n"; yui::YUI::app()->busyCursor(); - $DB::single = 1; my $lastItem = $w->{detail_list}->selectedItem() ? $w->{detail_list}->selectedItem()->label() : ""; $w->{detail_list}->startMultipleChanges(); $w->{detail_list}->deleteAllItems(); @@ -1610,9 +1609,6 @@ sub _build_tree { # better loop on packages, create groups tree and push packages in the proper place: my @groups = (); foreach my $pkg (@pkg_name_and_group_list) { - -# $DB::single = 1; - my $grp = $pkg->[1]; # no state for groups (they're not packages and thus have no state) push @groups, $grp; diff --git a/lib/AdminPanel/Rpmdragora/pkg.pm b/lib/AdminPanel/Rpmdragora/pkg.pm index 8025399..afa8832 100644 --- a/lib/AdminPanel/Rpmdragora/pkg.pm +++ b/lib/AdminPanel/Rpmdragora/pkg.pm @@ -209,8 +209,6 @@ sub download_callback { my ($gurpm, $mode, $file, $percent, $total, $eta, $speed) = @_; $canceled = 0; -# $DB::single = 1; - if ($mode eq 'start') { $gurpm->label($loc->N("Downloading package `%s'...", urpm::util::basename($file))); $gurpm->validate_cancel(but($loc->N("Cancel")), sub { $canceled = 1 }); diff --git a/modules/rpmdragora/rpmdragora b/modules/rpmdragora/rpmdragora index 9a91a7f..f1b268a 100755 --- a/modules/rpmdragora/rpmdragora +++ b/modules/rpmdragora/rpmdragora @@ -137,8 +137,6 @@ sub tree_callback { #OLD $model && $iter or return; $selection or return; - $DB::single = 1; - my $fullname = $selection->label(); my $it = $selection; while ($it = $it->parent()) { @@ -1188,8 +1186,7 @@ sub run_treeview_dialog { detaillist_callback($detail_list->selectedItem(), $info, \%$options); } elsif ($widget == $QuitButton) { - quit(); - last; + last if quit(); } } |