aboutsummaryrefslogtreecommitdiffstats
path: root/modules/rpmdragora
diff options
context:
space:
mode:
authorMatteo Pasotti <matteo@mageia.org>2013-01-09 16:40:23 +0000
committerMatteo Pasotti <matteo@mageia.org>2013-01-09 16:40:23 +0000
commit5b97980dd59e47ebf1d6f8ca37b7cafb48410bf6 (patch)
tree0279f7b29f4a41aa6adc05cf017dc79c14e323b2 /modules/rpmdragora
parent7deb546103eea4647985d5ec7bcbc97d1b0d886b (diff)
downloadcolin-keep-5b97980dd59e47ebf1d6f8ca37b7cafb48410bf6.tar
colin-keep-5b97980dd59e47ebf1d6f8ca37b7cafb48410bf6.tar.gz
colin-keep-5b97980dd59e47ebf1d6f8ca37b7cafb48410bf6.tar.bz2
colin-keep-5b97980dd59e47ebf1d6f8ca37b7cafb48410bf6.tar.xz
colin-keep-5b97980dd59e47ebf1d6f8ca37b7cafb48410bf6.zip
- rpmdragora: fixed warn_about_user_mode call
- rpmdragora.pm: interactive_msg now returns ask_YesOrOk() return value - Shared.pm: ask_ routines now return boolean rather than string - Shared.pm: added missing module requirement (common from libDrakX) - init.pm: warn_about_user_mode rewritten to return boolean
Diffstat (limited to 'modules/rpmdragora')
-rwxr-xr-xmodules/rpmdragora/rpmdragora7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/rpmdragora/rpmdragora b/modules/rpmdragora/rpmdragora
index 63d8f85..d8225e4 100755
--- a/modules/rpmdragora/rpmdragora
+++ b/modules/rpmdragora/rpmdragora
@@ -1034,7 +1034,10 @@ $my_win = $factory->createMainDialog;
readconf();
-warn_about_user_mode();
+if(!warn_about_user_mode()) {
+ quit();
+ exit(0);
+}
do_merge_if_needed();
@@ -1044,5 +1047,3 @@ init();
run_treeview_dialog(\&perform_installation);
writeconf();
-
-myexit(0);