dpkg-scanpackages: Use Dpkg::Versions instead of dpkg --compare-versions

diff --git a/ChangeLog b/ChangeLog
index 80e97c9060ece284479bf340a19058f4b8015d5a..43bb78a57ba4b5951febb12a78bf616b846c1b43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-29  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-scanpackages.pl: Use Dpkg::Version.
+       (vercmp): Use compare_versions instead of 'dpkg --compare-versions'.
+
 2007-11-29  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-scanpackages.pl: Use Dpkg::ErrorHandling. Use error

diff --git a/debian/changelog b/debian/changelog
index d940a2b7995fff96e88cb3fefe6e2a79caff2204..458869a0c8d53216a6e6bced048749947311c4f4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ dpkg (1.14.12) UNRELEASED; urgency=low
   * Move extern declarations to header files and stop defining them as extern.
   * Unify parsing of Section and Priority in dpkg-gencontrol with Homepage.
   * Change dpkg-scanpackages to use the Dpkg::ErrorHandling module.
+  * Change dpkg-scanpackages to use the Dpkg::Versions module.
 
  -- Guillem Jover <guillem@debian.org>  Sat, 24 Nov 2007 07:38:13 +0200
 

diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 7cd52f57f57dc8899200a5ca11c1542b1583ac70..9211e0306253084406ca3570884bf1c991e56f1e 100755 (executable)
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -9,6 +9,7 @@ use Dpkg;
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(error syserr subprocerr);
 use Dpkg::Deps qw(@pkg_dep_fields);
+use Dpkg::Version qw(compare_versions);
 
 textdomain("dpkg-dev");
 
@@ -144,9 +145,8 @@ my %vercache;
 sub vercmp {
      my ($a,$b)=@_;
      return $vercache{$a}{$b} if exists $vercache{$a}{$b};
-     system('dpkg','--compare-versions',$a,'le',$b);
-     $vercache{$a}{$b}=$?;
-     return $?;
+     $vercache{$a}{$b} = compare_versions($a, 'gt', $b);
+     return $vercache{$a}{$b};
 }
 
 my $find_h = new IO::Handle;