Don't exit with an error if we can't find the svn executable.
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 4 Aug 2009 00:35:30 +0000 (00:35 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 4 Aug 2009 00:35:30 +0000 (00:35 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29288 f5534014-38df-0310-8fa8-9805f1628bb7

make-version.pl

index c17626fc491b4887d6b3ba6365495e3241dcf786..827115e4b7dced16e0fd9b5575b101babba07175 100755 (executable)
@@ -104,21 +104,21 @@ sub read_svn_info {
                        use warnings "all";
                        no warnings "all";
                        $line = qx{svn info $srcdir};
-                       if (!defined($line)) {
-                               exit 1;
-                       }
-                       if ($line =~ /Last Changed Date: (\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/) {
-                               $last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
-                       }
-                       if ($line =~ /Last Changed Rev: (\d+)/) {
-                               $revision = $1;
-                       }
-                       if ($line =~ /URL: (\S+)/) {
-                               $repo_url = $1;
-                       }
-                       if ($line =~ /Repository Root: (\S+)/) {
-                               $repo_root = $1;
+                       if (defined($line)) {
+                               if ($line =~ /Last Changed Date: (\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/) {
+                                       $last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
+                               }
+                               if ($line =~ /Last Changed Rev: (\d+)/) {
+                                       $revision = $1;
+                               }
+                               if ($line =~ /URL: (\S+)/) {
+                                       $repo_url = $1;
+                               }
+                               if ($line =~ /Repository Root: (\S+)/) {
+                                       $repo_root = $1;
+                               }
                        }
+                       1;
                };
 
                if ($last_change && $revision && $repo_url && $repo_root) {