summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-23 17:20:02 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-23 17:20:02 +0000
commit5302a38eb5c738bbe8bd7b79f6f90a9ad24299cf (patch)
treef1e882d559ae0c9a4f8358a0b5d024f5dbf539a6
parent5bddf74cac865d8aa63e38a2c6cb72eb04debebf (diff)
downloaddrakx-5302a38eb5c738bbe8bd7b79f6f90a9ad24299cf.tar
drakx-5302a38eb5c738bbe8bd7b79f6f90a9ad24299cf.tar.gz
drakx-5302a38eb5c738bbe8bd7b79f6f90a9ad24299cf.tar.bz2
drakx-5302a38eb5c738bbe8bd7b79f6f90a9ad24299cf.tar.xz
drakx-5302a38eb5c738bbe8bd7b79f6f90a9ad24299cf.zip
move rpmsrate values in variables
-rw-r--r--perl-install/install/steps.pm2
-rw-r--r--perl-install/install/steps_gtk.pm2
-rw-r--r--perl-install/install/steps_interactive.pm2
-rw-r--r--perl-install/pkgs.pm2
4 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 3dd0682f2..53db56997 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -273,7 +273,7 @@ sub choosePackages {
my $availableCorrected = install::pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024);
log::l(sprintf "available size %s (corrected %s)", formatXiB($available), formatXiB($availableCorrected));
- add2hash_($o, { compssListLevel => 5 }) if !$::auto_install;
+ add2hash_($o, { compssListLevel => $pkgs::rpmsrate_rate_max }) if !$::auto_install;
#- !! destroying user selection of packages (they may have done individual selection before)
exists $o->{compssListLevel}
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 136c49dee..75002e07f 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -494,7 +494,7 @@ sub choosePackagesTree {
code => sub {
install::any::unselectMostPackages($o);
- install::pkgs::setSelectedFromCompssList($packages, { SYSTEM => 1 }, 4, $availableCorrected);
+ install::pkgs::setSelectedFromCompssList($packages, { SYSTEM => 1 }, $pkgs::rpmsrate_rate_default, $availableCorrected);
1;
} }),
],
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index e3640bddb..4729a717a 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -417,7 +417,7 @@ sub choosePackages {
install::steps::rebootNeeded($o);
}
- my $min_mark = 4;
+ my $min_mark = $pkgs::rpmsrate_rate_default;
my ($individual, $chooseGroups);
if (!$o->{isUpgrade}) {
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 3d1a959aa..2372a576f 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -7,6 +7,8 @@ use run_program;
use detect_devices;
use log;
+our $rpmsrate_rate_max = 5; # also defined in perl-URPM
+our $rpmsrate_rate_default = 4;
sub read_rpmsrate_raw {
my ($file) = @_;