summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/steps_gtk.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 921e05f1c..40c100ba8 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- do not set urpmi in automatic mode for gtk installs
+ (was set correctly for plain interactive installs only)
+
Version 12.33 - 23 April 2009
- fix not offering to upgrade 32 bit installations
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 764808da0..694278119 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -631,7 +631,7 @@ sub installPackages {
}
};
my $install_result;
- catch_cdie { $install_result = $o->install::steps::installPackages($packages) }
+ catch_cdie { $install_result = $o->install::steps::installPackages($packages, 'interactive') }
sub {
my $rc = install::steps_interactive::installPackages__handle_error($o, $_[0]);
$rc or $w->destroy;
generated by cgit v1.2.1 (git 2.21.0) at 2025-01-26 18:21:17 +0000
tr>
3 files changed, 6694 insertions, 5917 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index a407bb002..d98323f1d 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-08-21 14:27+0200\n"
+"POT-Creation-Date: 2001-08-25 21:33+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -533,14 +533,14 @@ msgid "Delay before booting default image"
msgstr ""
#: ../../any.pm_.c:161 ../../any.pm_.c:731
-#: ../../install_steps_interactive.pm_.c:944 ../../network/modem.pm_.c:46
-#: ../../printerdrake.pm_.c:352 ../../printerdrake.pm_.c:431
-#: ../../standalone/draknet_.c:591
+#: ../../install_steps_interactive.pm_.c:942 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:341 ../../printerdrake.pm_.c:415
+#: ../../standalone/draknet_.c:592
msgid "Password"
msgstr ""
#: ../../any.pm_.c:162 ../../any.pm_.c:732
-#: ../../install_steps_interactive.pm_.c:945
+#: ../../install_steps_interactive.pm_.c:943
msgid "Password (again)"
msgstr ""
@@ -575,12 +575,12 @@ msgid ""
msgstr ""
#: ../../any.pm_.c:175 ../../any.pm_.c:708
-#: ../../install_steps_interactive.pm_.c:939
+#: ../../install_steps_interactive.pm_.c:937
msgid "Please try again"
msgstr ""
#: ../../any.pm_.c:175 ../../any.pm_.c:708
-#: ../../install_steps_interactive.pm_.c:939
+#: ../../install_steps_interactive.pm_.c:937
msgid "The passwords do not match"
msgstr ""
@@ -619,9 +619,9 @@ msgid "Add"
msgstr ""
#: ../../any.pm_.c:221 ../../any.pm_.c:719 ../../diskdrake.pm_.c:176
-#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1281
-#: ../../printerdrake.pm_.c:1282 ../../printerdrake.pm_.c:1318
-#: ../../printerdrake.pm_.c:1352
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1204
+#: ../../printerdrake.pm_.c:1205 ../../printerdrake.pm_.c:1239
+#: ../../printerdrake.pm_.c:1271
msgid "Done"
msgstr ""
@@ -720,12 +720,12 @@ msgid "Do you have any %s interfaces?"
msgstr ""
#: ../../any.pm_.c:602 ../../any.pm_.c:761 ../../interactive.pm_.c:110
-#: ../../my_gtk.pm_.c:672
+#: ../../my_gtk.pm_.c:674
msgid "No"
msgstr ""
#: ../../any.pm_.c:602 ../../any.pm_.c:760 ../../interactive.pm_.c:110
-#: ../../my_gtk.pm_.c:672
+#: ../../my_gtk.pm_.c:674
msgid "Yes"
msgstr ""
@@ -836,8 +836,8 @@ msgstr ""
msgid "Real name"
msgstr ""
-#: ../../any.pm_.c:730 ../../printerdrake.pm_.c:351
-#: ../../printerdrake.pm_.c:430
+#: ../../any.pm_.c:730 ../../printerdrake.pm_.c:340
+#: ../../printerdrake.pm_.c:414
msgid "User name"
msgstr ""
@@ -997,20 +997,20 @@ msgstr ""
#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:105
#: ../../standalone/draknet_.c:137 ../../standalone/draknet_.c:201
-#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:421
-#: ../../standalone/draknet_.c:495 ../../standalone/draknet_.c:531
-#: ../../standalone/draknet_.c:632
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:422
+#: ../../standalone/draknet_.c:496 ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:633
msgid "OK"
msgstr ""
-#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:504
+#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:503
#: ../../interactive.pm_.c:120 ../../interactive.pm_.c:284
#: ../../interactive.pm_.c:304 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:413 ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:673
-#: ../../printerdrake.pm_.c:970 ../../standalone/drakgw_.c:648
+#: ../../my_gtk.pm_.c:415 ../../my_gtk.pm_.c:418 ../../my_gtk.pm_.c:675
+#: ../../printerdrake.pm_.c:894 ../../standalone/drakgw_.c:648
#: ../../standalone/draknet_.c:112 ../../standalone/draknet_.c:144
-#: ../../standalone/draknet_.c:306 ../../standalone/draknet_.c:507
-#: ../../standalone/draknet_.c:646 ../../standalone/tinyfirewall_.c:63
+#: ../../standalone/draknet_.c:306 ../../standalone/draknet_.c:508
+#: ../../standalone/draknet_.c:647 ../../standalone/tinyfirewall_.c:63
msgid "Cancel"
msgstr ""
@@ -1063,8 +1063,8 @@ msgstr ""
msgid "Please make a backup of your data first"
msgstr ""
-#: ../../diskdrake.pm_.c:102 ../../diskdrake_interactive.pm_.c:755
-#: ../../diskdrake_interactive.pm_.c:764 ../../diskdrake_interactive.pm_.c:818
+#: ../../diskdrake.pm_.c:102 ../../diskdrake_interactive.pm_.c:760
+#: ../../diskdrake_interactive.pm_.c:769 ../../diskdrake_interactive.pm_.c:823
msgid "Read carefully!"
msgstr ""
@@ -1091,7 +1091,7 @@ msgid "Remote"
msgstr ""
#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:453
-#: ../../diskdrake_interactive.pm_.c:323 ../../diskdrake_interactive.pm_.c:475
+#: ../../diskdrake_interactive.pm_.c:326 ../../diskdrake_interactive.pm_.c:480
msgid "Mount point"
msgstr ""
@@ -1100,16 +1100,16 @@ msgid "Options"
msgstr ""