From: cjwatson <>
Date: Mon, 18 Jul 2005 10:09:09 +0000 (-0800)
Subject: [project @ 2005-07-18 03:09:09 by cjwatson]
X-Git-Tag: release/2.6.0~699
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=52435cc0e3962b9e8e0bf199c555a77a2b0b1054;p=debbugs.git

[project @ 2005-07-18 03:09:09 by cjwatson]
fix version stripping regex
---

diff --git a/migrate/debbugs-makeversions b/migrate/debbugs-makeversions
index 4e067d62..fd70f2dc 100755
--- a/migrate/debbugs-makeversions
+++ b/migrate/debbugs-makeversions
@@ -81,7 +81,7 @@ sub getbuginfo ($)
 		$fv =~ s/;.*//;
 		$fv =~ s/ *\(.*\)//;
 		# Strip off other random junk at the end of a version.
-		$fv =~ s/ *[A-Za-z].*//;
+		$fv =~ s/ +[A-Za-z].*//;
 		$ver = $fv;
 	    }
 	}
diff --git a/scripts/errorlib.in b/scripts/errorlib.in
index 15f6610b..746e832a 100755
--- a/scripts/errorlib.in
+++ b/scripts/errorlib.in
@@ -1,5 +1,5 @@
 # -*- perl -*-
-# $Id: errorlib.in,v 1.45 2005/07/18 02:47:34 cjwatson Exp $
+# $Id: errorlib.in,v 1.46 2005/07/18 03:09:09 cjwatson Exp $
 
 use Mail::Address;
 use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
@@ -271,7 +271,7 @@ sub addfoundversions {
     # Strip off various kinds of brain-damage.
     $version =~ s/;.*//;
     $version =~ s/ *\(.*\)//;
-    $version =~ s/ *[A-Za-z].*//;
+    $version =~ s/ +[A-Za-z].*//;
 
     foreach my $ver (split /[,\s]+/, $version) {
         $ver = "$source/$ver" if defined $source;
@@ -307,7 +307,7 @@ sub addfixedversions {
     # Strip off various kinds of brain-damage.
     $version =~ s/;.*//;
     $version =~ s/ *\(.*\)//;
-    $version =~ s/ *[A-Za-z].*//;
+    $version =~ s/ +[A-Za-z].*//;
 
     foreach my $ver (split /[,\s]+/, $version) {
         $ver = "$source/$ver" if defined $source;