Merge lp:~dobey/intltool/m4esyscmd-support into lp:intltool

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 697
Merged at revision: not available
Proposed branch: lp:~dobey/intltool/m4esyscmd-support
Merge into: lp:intltool
Diff against target: None lines
To merge this branch: bzr merge lp:~dobey/intltool/m4esyscmd-support

This proposal supersedes a proposal from 2009-07-12.

Commit message

Handle m4_esyscmd usage in the package version variable

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'intltool-update.in'
--- intltool-update.in 2009-04-21 01:58:31 +0000
+++ intltool-update.in 2009-07-12 21:43:49 +0000
@@ -1142,6 +1142,17 @@
1142 ($name, $version) = ($1, $2);1142 ($name, $version) = ($1, $2);
1143 $bugurl = $3 if (defined $3);1143 $bugurl = $3 if (defined $3);
11441144
1145 # Handle m4_esyscmd
1146 # FIXME: We should do this in a more generic way that works for all vars
1147 if ($version =~ /m4_esyscmd\([\[]?([^\)\]]+)/)
1148 {
1149 my $cwd = getcwd ();
1150 chdir ("$SRCDIR/..");
1151 $version = qx($1);
1152 chdir ($cwd);
1153 }
1154
1155
1145 $name =~ s/[\[\]\s]//g;1156 $name =~ s/[\[\]\s]//g;
1146 $version =~ s/[\[\]\s]//g;1157 $version =~ s/[\[\]\s]//g;
1147 $bugurl =~ s/[\[\]\s]//g if (defined $bugurl);1158 $bugurl =~ s/[\[\]\s]//g if (defined $bugurl);

Subscribers

People subscribed via source and target branches

to all changes: