aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-02-20 11:48:06 +0000
committerThierry Vignaud <tv@mandriva.org>2007-02-20 11:48:06 +0000
commita3b672d1302f327dd4d850ce3339beb23fac06eb (patch)
tree7deac419e9c9618f968d92d6566283fb87cba297
parent832b42b76e562cca0d4db7c57999ef20f60137f7 (diff)
downloadrpmdrake-a3b672d1302f327dd4d850ce3339beb23fac06eb.tar
rpmdrake-a3b672d1302f327dd4d850ce3339beb23fac06eb.tar.gz
rpmdrake-a3b672d1302f327dd4d850ce3339beb23fac06eb.tar.bz2
rpmdrake-a3b672d1302f327dd4d850ce3339beb23fac06eb.tar.xz
rpmdrake-a3b672d1302f327dd4d850ce3339beb23fac06eb.zip
(interactive_list_,interactive_msg_with_banner) move them into rpmdrake.pm
-rwxr-xr-xrpmdrake2
-rw-r--r--rpmdrake.pm5
2 files changed, 5 insertions, 2 deletions
diff --git a/rpmdrake b/rpmdrake
index 4c15de49..7304214f 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -50,9 +50,7 @@ our $w;
my $treeview_dialog_run = 0;
our $statusbar;
-sub interactive_list_ { interactive_list(@_, if_($::main_window, transient => $::main_window)) }
sub wait_msg_with_banner { push @_, banner => 1 if $::isEmbedded && !$treeview_dialog_run; &statusbar_msg }
-sub interactive_msg_with_banner { push @_, banner => 1 if $::isEmbedded; &interactive_msg }
warn_about_user_mode();
diff --git a/rpmdrake.pm b/rpmdrake.pm
index e5c9d89a..a6ac9520 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -61,6 +61,8 @@ our @EXPORT = qw(
interactive_msg
interactive_packtable
interactive_list
+ interactive_list_
+ interactive_msg_with_banner
fatal_msg
getbanner
wait_msg
@@ -297,6 +299,9 @@ sub interactive_list {
$choice;
}
+sub interactive_list_ { interactive_list(@_, if_($::main_window, transient => $::main_window)) }
+sub interactive_msg_with_banner { push @_, banner => 1 if $::isEmbedded; &interactive_msg }
+
sub fatal_msg {
interactive_msg @_;
myexit -1;