diff options
| author | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2011-07-24 15:13:42 +0000 |
|---|---|---|
| committer | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2011-07-24 15:13:42 +0000 |
| commit | 4a8018b702f8b06ebb893d5da8577fe9791b9919 (patch) | |
| tree | 8434006ed6b8b512e1784f39fc80b867f10ef184 | |
| parent | e10c66d2d81ae1403cd29aab2bbd0561e178bff1 (diff) | |
| download | perl-URPM-4a8018b702f8b06ebb893d5da8577fe9791b9919.tar perl-URPM-4a8018b702f8b06ebb893d5da8577fe9791b9919.tar.gz perl-URPM-4a8018b702f8b06ebb893d5da8577fe9791b9919.tar.bz2 perl-URPM-4a8018b702f8b06ebb893d5da8577fe9791b9919.tar.xz perl-URPM-4a8018b702f8b06ebb893d5da8577fe9791b9919.zip | |
fix URPM::Resolve::fullname_parts() to also work without disttag & distepoch
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | URPM.pm | 2 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Version 4.37 - 24 July 2011, by Per Øyvind Karlsen + +- fix URPM::Resolve::fullname_parts() to also work without disttag & distepoch + Version 4.36 - 6 July 2011, by Per Øyvind Karlsen - document URPM::DB::convert() in API @@ -11,7 +11,7 @@ use URPM::Resolve; use URPM::Signature; our @ISA = qw(DynaLoader); -our $VERSION = '4.36'; +our $VERSION = '4.37'; URPM->bootstrap($VERSION); diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 9d03614..ca3758a 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -31,7 +31,7 @@ sub property2name_op_version { $_[0] =~ /^([^\s\[]*)(?:\[\*\])?\s*\[?([^\s\]]*)\s*([^\s\]]*)/; } sub fullname_parts { - $_[1] =~ sprintf(qr/^(.*)-([^\-]*)-([^\-]*)%s\.([^\.\-]*)$/, (exists $_[0]{disttag} ? "-" . $_[0]{disttag} . (exists $_[0]{distepoch} ? $_[0]{distepoch} : "" ) : "")); + $_[1] =~ sprintf(qr/^(.*)-([^\-]*)-([^\-]*)%s\.([^\.\-]*)$/, ((exists $_[0]{disttag} && $_[0]{disttag}) ? "-" . $_[0]{disttag} . ((exists $_[0]{distepoch} && $_[0]{distepoch}) ? $_[0]{distepoch} : "" ) : "")); } #- wrappers around $state (cf "The $state object" in "perldoc URPM") |