From 4a8018b702f8b06ebb893d5da8577fe9791b9919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=98yvind=20Karlsen?= <peroyvind@mandriva.org>
Date: Sun, 24 Jul 2011 15:13:42 +0000
Subject: fix URPM::Resolve::fullname_parts() to also work without disttag &
 distepoch

---
 NEWS            | 4 ++++
 URPM.pm         | 2 +-
 URPM/Resolve.pm | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 5377542..911a9b1 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/URPM.pm b/URPM.pm
index 81d3bfa..253f8d0 100644
--- a/URPM.pm
+++ b/URPM.pm
@@ -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")
-- 
cgit v1.2.1