summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Tassin <fta@ubuntu.com>2008-10-19 15:19:29 +0200
committerFabien Tassin <fta@ubuntu.com>2008-10-19 15:19:29 +0200
commit9e8f21795972b4fa55380a50eb7173ec2cec1e91 (patch)
tree95212c2034ce7a16ea308ce337858838db6d6a94
parentf0d2a9352d6f08f54218a1fe3061f8c550666e9c (diff)
* [mozclient] don't run MOZCLIENT_EXCLUDE_SCRIPT if does not exist as it
creates false positives - update src/mozclient/lib/MozClient/VCS.pm
-rw-r--r--debian/changelog3
-rw-r--r--src/mozclient/lib/MozClient/VCS.pm7
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 53326de..7cb9065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ mozilla-devscripts (0.11) UNRELEASED; urgency=low
of mozilla-devscripts by downstream. Introduce MOZCLIENT_PROJECTDIR.
- update README
- update src/mozclient.mk.in
+ - don't run MOZCLIENT_EXCLUDE_SCRIPT if does not exist as it creates
+ false positives
+ - update src/mozclient/lib/MozClient/VCS.pm
- drop $(EXT), left-over from when mozclient.pl was substed and use -c instead
- update src/mozclient.mk.in
- add support for git
diff --git a/src/mozclient/lib/MozClient/VCS.pm b/src/mozclient/lib/MozClient/VCS.pm
index f5b1b56..f5d1017 100644
--- a/src/mozclient/lib/MozClient/VCS.pm
+++ b/src/mozclient/lib/MozClient/VCS.pm
@@ -282,7 +282,12 @@ sub nobin_cleanup {
$self->chdir($self->work_dir . "/" . $self->{'MOZCLIENT_MOZDIRNAME'});
my $cmd = sprintf "sh %s > REMOVED+${nobinonly}.txt 2>&1",
$self->{'MOZCLIENT_EXCLUDE_SCRIPT'};
- $self->run_shell($cmd);
+ if (-e $self->{'MOZCLIENT_EXCLUDE_SCRIPT'}) {
+ $self->run_shell($cmd);
+ }
+ else {
+ $self->LOG("*warn* can't find " . $self->{'MOZCLIENT_EXCLUDE_SCRIPT'});
+ }
# Run a package specific clean-up script, if any
my $pkg_script = $self->{'MOZCLIENT_EXCLUDE_SCRIPT'};