Просмотр исходного кода

Dpkg::Version: Handle versions without a version component like dpkg.

Signed-off-by: James Vega <jamessan@debian.org>
Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
James Vega лет назад: 16
Родитель
Сommit
f97da90b79
3 измененных файлов с 5 добавлено и 1 удалено
  1. 1 0
      THANKS
  2. 3 0
      debian/changelog
  3. 1 1
      scripts/Dpkg/Version.pm

+ 1 - 0
THANKS

@@ -71,6 +71,7 @@ J.H.M. Dassen <jdassen@cistron.nl>
 Jacobo Tarrio <jtarrio@debian.org>
 Jacobo Tarrio <jtarrio@debian.org>
 James R. Van Zandt <jrvz@comcast.net>
 James R. Van Zandt <jrvz@comcast.net>
 James Troup <troup@debian.org>
 James Troup <troup@debian.org>
+James Vega <jamessan@debian.org>
 Jared Spiegel <jrrs@frontiernet.net>
 Jared Spiegel <jrrs@frontiernet.net>
 Jari Aalto <jari.aalto@cante.net>
 Jari Aalto <jari.aalto@cante.net>
 Javier Fernández-Sanguino Peña <jfs@debian.org>
 Javier Fernández-Sanguino Peña <jfs@debian.org>

+ 3 - 0
debian/changelog

@@ -4,6 +4,9 @@ dpkg (1.15.8.6) UNRELEASED; urgency=low
   * Ensure debian/source/local-options is always excluded from the source
   * Ensure debian/source/local-options is always excluded from the source
     package even if the user provides customized -i or -I options.
     package even if the user provides customized -i or -I options.
     Closes: #597023
     Closes: #597023
+  * Fix Dpkg::Version's handling of version with a debian revision but an
+    empty version (e.g. "-0.1"). Thanks to James Vega <jamessan@debian.org>
+    for the patch. Closes: #597651
 
 
   [ Updated man page translations ]
   [ Updated man page translations ]
   * French (Christian Perrier).
   * French (Christian Perrier).

+ 1 - 1
scripts/Dpkg/Version.pm

@@ -95,7 +95,7 @@ sub new {
 	$self->{'epoch'} = 0;
 	$self->{'epoch'} = 0;
 	$self->{'no_epoch'} = 1;
 	$self->{'no_epoch'} = 1;
     }
     }
-    if ($ver =~ /(.+)-(.*)$/) {
+    if ($ver =~ /(.*)-(.*)$/) {
 	$self->{'version'} = $1;
 	$self->{'version'} = $1;
 	$self->{'revision'} = $2;
 	$self->{'revision'} = $2;
     } else {
     } else {