diff options
author | Gerald Combs <gerald@wireshark.org> | 2009-08-04 00:35:30 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2009-08-04 00:35:30 +0000 |
commit | d574a2450be73dfdf431dd7c26713a5b60437048 (patch) | |
tree | a93e421ec684db73ae8a324ba815d73de248290d /make-version.pl | |
parent | 87c095780a9fc7377a47c5e7ff8befef942ef0ed (diff) | |
download | wireshark-d574a2450be73dfdf431dd7c26713a5b60437048.tar.gz wireshark-d574a2450be73dfdf431dd7c26713a5b60437048.tar.bz2 wireshark-d574a2450be73dfdf431dd7c26713a5b60437048.zip |
Don't exit with an error if we can't find the svn executable.
svn path=/trunk/; revision=29288
Diffstat (limited to 'make-version.pl')
-rwxr-xr-x | make-version.pl | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/make-version.pl b/make-version.pl index c17626fc49..827115e4b7 100755 --- a/make-version.pl +++ b/make-version.pl @@ -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) { |