- fix epoch handling in binary query
authorMichael Schroeder <mls@suse.de>
Mon, 7 Dec 2009 10:48:15 +0000 (11:48 +0100)
committerMichael Schroeder <mls@suse.de>
Mon, 7 Dec 2009 10:48:15 +0000 (11:48 +0100)
Build/Deb.pm

index 9d4c8ed..b44541a 100644 (file)
@@ -241,12 +241,10 @@ sub query {
   };
   $data->{'source'} = $src if $src ne '';
   if ($opts{'evra'}) {
-    if ($res{'VERSION'} =~ /^(.*)-(.*?)$/) {
-      $data->{'version'} = $1;
-      $data->{'release'} = $2;
-    } else {
-      $data->{'version'} = $res{'VERSION'};
-    }
+    $res{'VERSION'} =~ /^(?:(\d+):)?(.*?)(?:-([^-]*))?$/s;
+    $data->{'epoch'} = $1 if defined $1;
+    $data->{'version'} = $2;
+    $data->{'release'} = $3 if defined $3;
     $data->{'arch'} = $res{'ARCHITECTURE'};
   }
   if ($opts{'description'}) {