aboutsummaryrefslogtreecommitdiffstats
path: root/URPM/Resolve.pm
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2011-07-24 15:13:42 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2011-07-24 15:13:42 +0000
commit4a8018b702f8b06ebb893d5da8577fe9791b9919 (patch)
tree8434006ed6b8b512e1784f39fc80b867f10ef184 /URPM/Resolve.pm
parente10c66d2d81ae1403cd29aab2bbd0561e178bff1 (diff)
downloadperl-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
Diffstat (limited to 'URPM/Resolve.pm')
-rw-r--r--URPM/Resolve.pm2
1 files changed, 1 insertions, 1 deletions
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")