diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-03 10:14:54 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-03 10:14:54 +0000 |
| commit | 5fce76fb3ad04f7a7de34c7b3c276b360e2a6ccb (patch) | |
| tree | 562f0560f36f8a4a8fbb7e291d9c7c19745ce29a | |
| parent | 61ce39b82305fb298fca29872edb39f621150008 (diff) | |
| download | urpmi-5fce76fb3ad04f7a7de34c7b3c276b360e2a6ccb.tar urpmi-5fce76fb3ad04f7a7de34c7b3c276b360e2a6ccb.tar.gz urpmi-5fce76fb3ad04f7a7de34c7b3c276b360e2a6ccb.tar.bz2 urpmi-5fce76fb3ad04f7a7de34c7b3c276b360e2a6ccb.tar.xz urpmi-5fce76fb3ad04f7a7de34c7b3c276b360e2a6ccb.zip | |
- urpmf:
o fix searching for more than one pattern (#38286)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | urpm/args.pm | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 |