summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-12-10 08:59:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-12-10 08:59:22 +0000
commit13d7dc173e8c83c12516cb9924b5cc7394d99f04 (patch)
tree2f2db9b39ffa47a3d395281b730c29795a8c9678
parentfd659327e68d34233126711de86b709ffec9a2af (diff)
downloadurpmi-13d7dc173e8c83c12516cb9924b5cc7394d99f04.tar
urpmi-13d7dc173e8c83c12516cb9924b5cc7394d99f04.tar.gz
urpmi-13d7dc173e8c83c12516cb9924b5cc7394d99f04.tar.bz2
urpmi-13d7dc173e8c83c12516cb9924b5cc7394d99f04.tar.xz
urpmi-13d7dc173e8c83c12516cb9924b5cc7394d99f04.zip
- urpmi:
o handle --suggests (to override urpmi.cfg global option "no-suggests") (#36007)
-rw-r--r--NEWS2
-rw-r--r--t/superuser--suggests.t11
-rw-r--r--urpm/args.pm2
3 files changed, 14 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 4c514035..ba1d71fc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- urpmi:
+ o handle --suggests (to override urpmi.cfg global option "no-suggests")
- urpmi.update:
o exit code 1 when a (selected) medium can't be updated (#35952)
o leave early with error if no medium were successfull updated
diff --git a/t/superuser--suggests.t b/t/superuser--suggests.t
index 0b38a9a7..e6caeaa3 100644
--- a/t/superuser--suggests.t
+++ b/t/superuser--suggests.t
@@ -29,6 +29,7 @@ test_c();
test_invalid();
test_upgrade();
test_d();
+test_force_suggests();
sub test_b {
test('b', ['bb'], ['suggested_b']);
@@ -103,3 +104,13 @@ sub test_d {
}
}
+sub test_force_suggests {
+ set_urpmi_cfg_global_options({ 'no-suggests' => '' });
+
+ urpmi("--auto b");
+ check_installed_and_remove('b', 'bb');
+ urpmi("--auto --suggests b");
+ check_installed_and_remove('b', 'bb', 'suggested_b');
+
+ set_urpmi_cfg_global_options({});
+}
diff --git a/urpm/args.pm b/urpm/args.pm
index 209d73bc..58cbdacd 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -102,7 +102,7 @@ my %options_spec = (
force => \$::force,
justdb => \$options{justdb},
replacepkgs => \$options{replacepkgs},
- 'no-suggests' => sub { $urpm->{options}{'no-suggests'} = 1 },
+ 'suggests!' => sub { $urpm->{options}{'no-suggests'} = !$_[1] },
'allow-nodeps' => sub { $urpm->{options}{'allow-nodeps'} = 1 },
'allow-force' => sub { $urpm->{options}{'allow-force'} = 1 },
'parallel=s' => \$::parallel,