remove --long from git describe call

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 5c3f0fb90a19c83fd59a4ffe5da2838fd90a9697..3b931a0fba1b8407ee37592d65cd16013e462b27 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -370,7 +370,7 @@ if (DXSql::init($dsn)) {
        $dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
 }
 
-# try to load Encode
+# try to load Encode and Git
 {
        local $^W = 0;
        my $w = $SIG{__DIE__};
@@ -380,6 +380,23 @@ if (DXSql::init($dsn)) {
                import Encode;
                $can_encode = 1;
        }
+       eval { require Git; };
+       unless ($@) {
+               import Git;
+               
+               # determine the real version number
+               my $repo = Git->repository(Directory => "$root/.git");
+               if ($repo) {
+                       my $desc = $repo->command_oneline(['describe'], STDERR => 0);
+                       if ($desc) {
+                               my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
+                               $version = $v;
+                               $subversion = $s || 0;
+                               $build = $b || 0;
+                               $gitversion = "$g\[r]";
+                       }
+               }
+       }
        $SIG{__DIE__} = $w;
 }
 
@@ -567,6 +584,8 @@ for (;;) {
                AGWMsg::process();
                BPQMsg::process();
 
+               DXLog::flushall();
+               
                if (defined &Local::process) {
                        eval {
                                Local::process();       # do any localised processing