[openoffice] branch AOO418 updated: Force git/svn version to display if we are a src build

[jim]

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO418 by this push:
     new 67baec1  Force git/svn version to display if we are a src build
67baec1 is described below

commit 67baec149339bf2110a9e91f415b27b41c65b595
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Thu Oct 29 06:38:37 2020 -0400

    Force git/svn version to display if we are a src build
    
    (cherry picked from commit 8403f704f807051b7f1dc4cc96915c2e825f68d3)
---
 main/solenv/bin/modules/RepoRevision.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/main/solenv/bin/modules/RepoRevision.pm 
b/main/solenv/bin/modules/RepoRevision.pm
index 580e0cf..200a6bc 100644
--- a/main/solenv/bin/modules/RepoRevision.pm
+++ b/main/solenv/bin/modules/RepoRevision.pm
@@ -75,6 +75,10 @@ sub DetectRevisionId ($)
        my $path = shift;
        my $id = undef;
 
+       #NOTE: Magic cookie file 'reporevision.lst' created by aoo_srcrelease
+       $id = DetectRevisionIdFromFile 
("$ENV{'SOLARENV'}/inc/reporevision.lst");
+       if ($id) { return $id };
+
        my $NotGit = `cd $path && git rev-parse --git-dir > /dev/null 2>&1`;
        if (!$NotGit || -d ".git" || -d "$path/.git")
        {
@@ -85,12 +89,7 @@ sub DetectRevisionId ($)
                $id = DetectRevisionIdFromSVN ($path);
        }
 
-       if (!$id)
-       {
-               #NOTE: Magic cookie file 'reporevision.lst' created by 
aoo_srcrelease
-               $id = DetectRevisionIdFromFile 
("$ENV{'SOLARENV'}/inc/reporevision.lst");
-               if (!$id) { $id = "unknown-rev" };
-       }
+       if (!$id) { $id = "unknown-rev" };
        return $id;
 }