X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2FCommods.pm;fp=pctb%2FCommods.pm;h=e695f15a5efe27afefba5ecdec381f1d87900e4e;hp=d59529b0a6b1eb0121d3761e45a5a34c42686993;hb=b99e2f9531a0d06479d6e05fbd54816a07559469;hpb=fd1dfe6db4a898d7e96a577c68599fc992238326

diff --git a/pctb/Commods.pm b/pctb/Commods.pm
index d59529b..e695f15 100644
--- a/pctb/Commods.pm
+++ b/pctb/Commods.pm
@@ -11,7 +11,8 @@ BEGIN {
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&parse_masters %oceans %commods %clients
-		      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap);
+		      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
+		      &get_our_version);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
@@ -51,7 +52,7 @@ sub parse_master_master1 ($$) {
 		    $oceans{$ocean}{$arch}{$_} .= $src;
 		};
 	    });
-	} elsif (m/^client (\S+)$/) {
+	} elsif (m/^client (\S+.*\S)$/) {
 	    my $client= $1;
 	    $clients{$client}= [ ];
 	    @ctx= (sub {
@@ -108,4 +109,15 @@ sub parse_pctb_commodmap () {
     return 1;
 }
 
+sub get_our_version ($) {
+    my ($prefix);
+    {
+	no strict (qw(refs));
+	${ "${prefix}name"  }= 'ypp-sc-tools yarrg';
+        ${ "${prefix}fixes" }= 'lastpage';
+        ${ "${prefix}version" }= `git-describe --tags HEAD`;
+        $? and die $?;
+    }
+}
+
 1;