Fix package version stamping.
authorGerald Combs <gerald@wireshark.org>
Fri, 13 Jun 2014 19:51:29 +0000 (12:51 -0700)
committerGerald Combs <gerald@wireshark.org>
Fri, 13 Jun 2014 20:20:57 +0000 (20:20 +0000)
Change-Id: I1615364071563c4f56b071d7d68e4660dd989296
Reviewed-on: https://code.wireshark.org/review/2198
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit fd017eeae358fbcbb3f51f2765bd31777aa513d1)
Reviewed-on: https://code.wireshark.org/review/2201

make-version.pl

index cda9eff18dc5fd9f9e6bfc237feee3e8d2af2de1..1860be103145e90d7c2b162199aa4b4b99a72325 100755 (executable)
@@ -351,7 +351,7 @@ sub read_repo_info {
 
        # If we picked up the revision and modification time,
        # generate our strings.
-       if ($num_commits && $last_change) {
+       if ($version_pref{"pkg_enable"}) {
                $version_format =~ s/%#/$num_commits/;
                $package_format =~ s/%#/$num_commits-$commit_id/;
                $package_string = strftime($package_format, gmtime($last_change));