summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-10-26 13:50:28 +0300
committerJason McDonald <jason.mcdonald@nokia.com>2010-10-27 11:08:57 +1000
commite8123e3392ecc36177d9a8537c2dd32a258ab3cb (patch)
tree9d9dd221ed24907fb9adfb90550abc1815a811d5
parentd093af32cd780a13a3e43e9c292c53ce9160151e (diff)
Fix patch_capabilities.pl script for explicit set of capabilities
Elftran command never got executed when explicit set of capabilities was defined. No warning or error was printed either, making it rather confusing for user. Task-number: QTBUG-14730 Reviewed-by: Janne Koskinen (cherry picked from commit f603ce9a960ee387ab10be1916da8ffd09305045)
-rwxr-xr-xbin/patch_capabilities.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index 76ba24b58b..430cbcbe25 100755
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -269,6 +269,9 @@ if (@ARGV)
if (@capabilitiesSpecified)
{
$commandToExecute = sprintf($baseCommandToExecute, join(" ", @capabilitiesSpecified));
+ $executeNeeded = 1;
+ my $capString = join(" ", @capabilitiesSpecified);
+ print ("Patching: Patching the the Vendor ID to 0 and the capabilities used to: \"$capString\" in \"$binaryBaseName\".\n");
} else {
# Test which capabilities are present and then restrict them to the allowed set.
# This avoid raising the capabilities of apps that already have none.