summaryrefslogtreecommitdiffstats
path: root/perl-install/pkgs.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-01-10 15:44:20 +0000
committerFrancois Pons <fpons@mandriva.com>2000-01-10 15:44:20 +0000
commit3a2545452f8ddb6bfe8eee02c313769d38f74300 (patch)
treefeb82786c2d23c22f26e5b4e43bd1c9421ddc2d7 /perl-install/pkgs.pm
parent4fe837d51fcc99ac6d1e80463b5e13520b250839 (diff)
downloaddrakx-3a2545452f8ddb6bfe8eee02c313769d38f74300.tar
drakx-3a2545452f8ddb6bfe8eee02c313769d38f74300.tar.gz
drakx-3a2545452f8ddb6bfe8eee02c313769d38f74300.tar.bz2
drakx-3a2545452f8ddb6bfe8eee02c313769d38f74300.tar.xz
drakx-3a2545452f8ddb6bfe8eee02c313769d38f74300.zip
*** empty log message ***
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r--perl-install/pkgs.pm12
1 files changed, 12 insertions, 0 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 4285ec229..a905b9284 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -396,6 +396,12 @@ sub selectPackagesToUpgrade($$$;$$) {
local $_; #- else perl complains on the map { ... } grep { ... } @...;
my %installedFilesForUpgrade; #- help searching package to upgrade in regard to already installed files.
+ #- used for package that are not correctly updated.
+ my %upgradeNeedRemove = (
+ 'compat-glibc' => 1,
+ 'compat-libs' => 1,
+ );
+
#- help removing package which may have different release numbering
my %toRemove; map { $toRemove{$_} = 1 } @{$toRemove || []};
@@ -423,6 +429,12 @@ sub selectPackagesToUpgrade($$$;$$) {
} else {
$p->{installed} = 1;
}
+ } elsif ($upgradeNeedRemove{$p->{name}}) {
+ my $otherPackage = (c::headerGetEntry($header, 'name'). '-' .
+ c::headerGetEntry($header, 'version'). '-' .
+ c::headerGetEntry($header, 'release'));
+ log::l("removing $otherPackage since it will not upgrade correctly!");
+ $toRemove{$otherPackage} = 1; #- force removing for theses other packages, select our.
}
} else {
my @files = c::headerGetEntry($header, 'filenames');
../../Xconfigurator.pm_.c:232
msgid "Use Xinerama extension"
msgstr ""
-#: ../../Xconfigurator.pm_.c:234
+#: ../../Xconfigurator.pm_.c:235
#, c-format
msgid "Configure only card \"%s\" (%s)"
msgstr ""
-#: ../../Xconfigurator.pm_.c:237
+#: ../../Xconfigurator.pm_.c:238
msgid "Multi-head configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:238
+#: ../../Xconfigurator.pm_.c:239
msgid ""
"Your system support multiple head configuration.\n"
"What do you want to do?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:248
msgid "Graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:247
+#: ../../Xconfigurator.pm_.c:248
msgid "Select a graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:248
+#: ../../Xconfigurator.pm_.c:249
msgid "Choose a X server"
msgstr ""
-#: ../../Xconfigurator.pm_.c:248
+#: ../../Xconfigurator.pm_.c:249
msgid "X server"
msgstr ""
-#: ../../Xconfigurator.pm_.c:300 ../../Xconfigurator.pm_.c:307
+#: ../../Xconfigurator.pm_.c:301 ../../Xconfigurator.pm_.c:308
#, c-format
msgid "XFree %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:303
+#: ../../Xconfigurator.pm_.c:304
msgid "Which configuration of XFree do you want to have?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:316
+#: ../../Xconfigurator.pm_.c:317
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
"Your card is supported by XFree %s which may have a better support in 2D."
msgstr ""
-#: ../../Xconfigurator.pm_.c:318 ../../Xconfigurator.pm_.c:351
+#: ../../Xconfigurator.pm_.c:319 ../../Xconfigurator.pm_.c:352
#, c-format
msgid "Your card can have 3D hardware acceleration support with XFree %s."
msgstr ""
-#: ../../Xconfigurator.pm_.c:320 ../../Xconfigurator.pm_.c:353
+#: ../../Xconfigurator.pm_.c:321 ../../Xconfigurator.pm_.c:354
#, c-format
msgid "XFree %s with 3D hardware acceleration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:342
+#: ../../Xconfigurator.pm_.c:329 ../../Xconfigurator.pm_.c:343
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support with XFree %s,\n"
"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
msgstr ""
-#: ../../Xconfigurator.pm_.c:330 ../../Xconfigurator.pm_.c:344
+#: ../../Xconfigurator.pm_.c:331 ../../Xconfigurator.pm_.c:345
#, c-format
msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:339
+#: ../../Xconfigurator.pm_.c:340
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -99,27 +99,27 @@ msgid ""
"Your card is supported by XFree %s which may have a better support in 2D."
msgstr ""
-#: ../../Xconfigurator.pm_.c:359
+#: ../../Xconfigurator.pm_.c:360
msgid "XFree configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:392
+#: ../../Xconfigurator.pm_.c:393
msgid "Select the memory size of your graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:439
+#: ../../Xconfigurator.pm_.c:440
msgid "Choose options for server"
msgstr ""
-#: ../../Xconfigurator.pm_.c:456
+#: ../../Xconfigurator.pm_.c:457
msgid "Choose a monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:456
+#: ../../Xconfigurator.pm_.c:457
msgid "Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:459
+#: ../../Xconfigurator.pm_.c:460
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -133,190 +133,190 @@ msgid ""
" If in doubt, choose a conservative setting."
msgstr ""
-#: ../../Xconfigurator.pm_.c:466
+#: ../../Xconfigurator.pm_.c:467
msgid "Horizontal refresh rate"
msgstr ""
-#: ../../Xconfigurator.pm_.c:467
+#: ../../Xconfigurator.pm_.c:468
msgid "Vertical refresh rate"
msgstr ""
-#: ../../Xconfigurator.pm_.c:504
+#: ../../Xconfigurator.pm_.c:505
msgid "Monitor not configured"
msgstr ""
-#: ../../Xconfigurator.pm_.c:507
+#: ../../Xconfigurator.pm_.c:508
msgid "Graphic card not configured yet"
msgstr ""
-#: ../../Xconfigurator.pm_.c:510
+#: ../../Xconfigurator.pm_.c:511
msgid "Resolutions not chosen yet"
msgstr ""
-#: ../../Xconfigurator.pm_.c:526
+#: ../../Xconfigurator.pm_.c:527
msgid "Do you want to test the configuration?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:530
+#: ../../Xconfigurator.pm_.c:531
msgid "Warning: testing this graphic card may freeze your computer"
msgstr ""
-#: ../../Xconfigurator.pm_.c:533
+#: ../../Xconfigurator.pm_.c:534
msgid "Test of the configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:572
+#: ../../Xconfigurator.pm_.c:573
msgid ""
"\n"
"try to change some parameters"
msgstr ""
-#: ../../Xconfigurator.pm_.c:572
+#: ../../Xconfigurator.pm_.c:573
msgid "An error has occurred:"
msgstr ""
-#: ../../Xconfigurator.pm_.c:594
+#: ../../Xconfigurator.pm_.c:595
#, c-format
msgid "Leaving in %d seconds"
msgstr ""
-#: ../../Xconfigurator.pm_.c:604
+#: ../../Xconfigurator.pm_.c:605
msgid "Is this the correct setting?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:612
+#: ../../Xconfigurator.pm_.c:613
msgid "An error has occurred, try to change some parameters"
msgstr ""
-#: ../../Xconfigurator.pm_.c:659 ../../printerdrake.pm_.c:273
+#: ../../Xconfigurator.pm_.c:660 ../../printerdrake.pm_.c:273
#: ../../services.pm_.c:107
msgid "Resolution"
msgstr ""
-#: ../../Xconfigurator.pm_.c:697
+#: ../../Xconfigurator.pm_.c:698
msgid "Choose the resolution and the color depth"
msgstr ""
-#: ../../Xconfigurator.pm_.c:699
+#: ../../Xconfigurator.pm_.c:700
#, c-format
msgid "Graphic card: %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:700
+#: ../../Xconfigurator.pm_.c:701
#, c-format
msgid "XFree86 server: %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:716 ../../standalone/draknet_.c:246
+#: ../../Xconfigurator.pm_.c:717 ../../standalone/draknet_.c:246
#: ../../standalone/draknet_.c:249
msgid "Expert Mode"
msgstr ""
-#: ../../Xconfigurator.pm_.c:717
+#: ../../Xconfigurator.pm_.c:718
msgid "Show all"
msgstr ""
-#: ../../Xconfigurator.pm_.c:755
+#: ../../Xconfigurator.pm_.c:756
msgid "Resolutions"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1196
+#: ../../Xconfigurator.pm_.c:1258
#, c-format
msgid "Keyboard layout: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1197
+#: ../../Xconfigurator.pm_.c:1259
#, c-format
msgid "Mouse type: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1198
+#: ../../Xconfigurator.pm_.c:1260
#, c-format
msgid "Mouse device: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1199
+#: ../../Xconfigurator.pm_.c:1261
#, c-format
msgid "Monitor: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1200
+#: ../../Xconfigurator.pm_.c:1262
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1201
+#: ../../Xconfigurator.pm_.c:1263
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1202
+#: ../../Xconfigurator.pm_.c:1264
#, c-format
msgid "Graphic card: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1203
+#: ../../Xconfigurator.pm_.c:1265
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1205
+#: ../../Xconfigurator.pm_.c:1267
#, c-format
msgid "Color depth: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1206
+#: ../../Xconfigurator.pm_.c:1268
#, c-format
msgid "Resolution: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1208
+#: ../../Xconfigurator.pm_.c:1270
#, c-format
msgid "XFree86 server: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1209
+#: ../../Xconfigurator.pm_.c:1271
#, c-format
msgid "XFree86 driver: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1228
+#: ../../Xconfigurator.pm_.c:1290
msgid "Preparing X-Window configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1248 ../../standalone/drakboot_.c:45
+#: ../../Xconfigurator.pm_.c:1310 ../../standalone/drakboot_.c:45
msgid "What do you want to do?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1253
+#: ../../Xconfigurator.pm_.c:1315
msgid "Change Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1254
+#: ../../Xconfigurator.pm_.c:1316
msgid "Change Graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1256
+#: ../../Xconfigurator.pm_.c:1318
msgid "Change Server options"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1257
+#: ../../Xconfigurator.pm_.c:1319
msgid "Change Resolution"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1258
+#: ../../Xconfigurator.pm_.c:1320
msgid "Show information"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1259
+#: ../../Xconfigurator.pm_.c:1321
msgid "Test again"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1260 ../../bootlook.pm_.c:204
+#: ../../Xconfigurator.pm_.c:1322 ../../bootlook.pm_.c:204
msgid "Quit"