summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-12-01 12:28:38 +0000
committerOlivier Blin <oblin@mandriva.com>2009-12-01 12:28:38 +0000
commit426c4e709ef5160c108675560a42c60c8f8cb089 (patch)
treeab63a4d0a6c141e490c7cf5b4075f61c99517e48 /perl-install/standalone
parent62df2d8507ec9ae9138ff3dfc6a4445332a5701d (diff)
downloaddrakx-426c4e709ef5160c108675560a42c60c8f8cb089.tar
drakx-426c4e709ef5160c108675560a42c60c8f8cb089.tar.gz
drakx-426c4e709ef5160c108675560a42c60c8f8cb089.tar.bz2
drakx-426c4e709ef5160c108675560a42c60c8f8cb089.tar.xz
drakx-426c4e709ef5160c108675560a42c60c8f8cb089.zip
do not warn about already installed packages when run as user
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/localedrake8
1 files changed, 5 insertions, 3 deletions
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, $>);