Forráskód Böngészése

dpkg-buildpackage: Use Dpkg::Version instead of ad-hoc parsing

Use the as_string() method to get a string with the epoch stripped,
instead of stripping it manually. And pass the created object to
version_check() to avoid doing the conversion twice.
Guillem Jover 12 éve
szülő
commit
4132e360be
1 módosított fájl, 3 hozzáadás és 2 törlés
  1. 3 2
      scripts/dpkg-buildpackage.pl

+ 3 - 2
scripts/dpkg-buildpackage.pl

@@ -351,10 +351,11 @@ my $changelog = changelog_parse();
 
 my $pkg = mustsetvar($changelog->{source}, _g('source package'));
 my $version = mustsetvar($changelog->{version}, _g('source version'));
-my ($ok, $error) = version_check($version);
+my $v = Dpkg::Version->new($version);
+my ($ok, $error) = version_check($v);
 error($error) unless $ok;
 
-(my $sversion = $version) =~ s/^\d+://;
+my $sversion = $v->as_string(omit_epoch => 1);
 
 my $distribution = mustsetvar($changelog->{distribution}, _g('source distribution'));