summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/localedrake8
2 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index fa2b092e5..fbeebd751 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -19,6 +19,8 @@
o allow labels to be set selectable
- diskdrake:
o allow copying disk and partition infos (#55886)
+- localedrake:
+ o do not warn about already installed packages when run as user
Version 12.78 - 18 November 2009
diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake
index c4bbf16ef..cb2b81da6 100755
--- a/perl-install/standalone/localedrake
+++ b/perl-install/standalone/localedrake
@@ -39,16 +39,18 @@ $::Wizard_title = N("LocaleDrake");
any::selectLanguage_and_more_standalone($in, $locale);
-if ($> && lang::IM2packages($locale)) {
+if ($>) {
+ my @required_packages = lang::IM2packages($locale);
+ my @missing_packages = difference2(\@required_packages, [ $in->do_pkgs->are_installed(@required_packages) ]);
$in->ask_warn(N("Warning"),
N("You should install the following packages: %s",
join(
#-PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
N(", "),
- lang::IM2packages($locale)
+ @missing_packages,
),
)
- );
+ ) if @missing_packages;
}
lang::write_and_install($locale, $in->do_pkgs, $>);