summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--urpm/args.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index bba621e0..f2cbb4e9 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@
- urpmi:
o fix using proxy with curl (#38143)
o do not copy rpms from cdrom if only one cdrom is used (#28083)
+- urpmf:
+ o fix searching for more than one pattern (#38286)
Version 5.6 - 26 February 2008, by Pascal "Pixel" Rigaux
diff --git a/urpm/args.pm b/urpm/args.pm
index 158f78f3..e5aeec01 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -356,7 +356,7 @@ sub add_urpmf_parameter {
# quote "+" chars for packages with + in their names
$p =~ s/\+/\\+/g;
}
- $::expr .= "m{$p}" . $::pattern;
+ $::expr .= ($::expr ? ' || ' : '') . "m{$p}" . $::pattern;
}
# common options setup