diff options
| author | Danilo Šegan <danilo@canonical.com> | 2010-03-24 12:10:22 -0300 |
|---|---|---|
| committer | Danilo Šegan <danilo@canonical.com> | 2010-03-24 12:10:22 -0300 |
| commit | 95f685bdf86c178709ab963b9c9d0c6d46ef2d80 (patch) | |
| tree | b63daba3ed276abc0b47b3d84dc4b0569fc72432 | |
| parent | 87e81124d8d89b9e344af0d80151b6b4edba978a (diff) | |
| download | intltool-95f685bdf86c178709ab963b9c9d0c6d46ef2d80.tar.gz | |
Avoid warnings in isNotValidMissing when PACKAGE/VERSION variables are not known from makefiles.
| -rw-r--r-- | intltool-update.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intltool-update.in b/intltool-update.in index e838ff4..d55fd41 100644 --- a/intltool-update.in +++ b/intltool-update.in @@ -307,9 +307,13 @@ sub TextFile_DetermineEncoding ($) sub isNotValidMissing { my ($file) = @_; + my $package_name = ""; + my $version = ""; + $package_name = $varhash{"PACKAGE"} if (defined $varhash{"PACKAGE"}); + $version = $varhash{"VERSION"} if (defined $varhash{"VERSION"}); return if $file =~ /^\{arch\}\/.*$/; - return if $file =~ /^$varhash{"PACKAGE"}-$varhash{"VERSION"}\/.*$/; + return if $file =~ /^$package_name-$version\/.*$/; } sub removeFromArray |