diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-16 09:38:38 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-16 16:14:36 -0400 |
| commit | 4db62dfbce440864df27c0a99ae46866fb4c16ca (patch) | |
| tree | 03802e9819134fa825dba314b946bd4aded7b226 /filter | |
| parent | 6388703a76be472d47c16714bc7f31741bab1f27 (diff) | |
quiet FCFGMerge
Change-Id: I17a2f2fd51a06195af3b5b7325b3bad1129c01d2
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Configuration_filter.mk | 3 | ||||
| -rwxr-xr-x | filter/source/config/tools/merge/pyAltFCFGMerge | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 2cd9119fa0bf..45ca96570603 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -24,7 +24,8 @@ filter_MERGE_TARGET := $(call gb_ExternalExecutable_get_dependencies,python) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge filter_MERGE := $(call gb_ExternalExecutable_get_command,python) \ - $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge + $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge \ + $(if $(VERBOSE)$(verbose),-verbose) ### filter configuration rules: generic stuff ####################### diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge index 7c725ce6685b..1baecf6aa4ef 100755 --- a/filter/source/config/tools/merge/pyAltFCFGMerge +++ b/filter/source/config/tools/merge/pyAltFCFGMerge @@ -39,6 +39,7 @@ PROP_FCFG = "fcfg" # // <= cmdline PROP_LCFG = "lcfg" # // <= cmdline PROP_CCFG = "ccfg" # // <= cmdline PROP_LANGUAGEPACK = "languagepack" # // <= cmdline +PROP_VERBOSE = "verbose" # // <= cmdline PROP_ITEMS = "items" # // <= pkg cfg files! #---begin java.util.Properties copy---# @@ -275,9 +276,11 @@ def readprops(buff): # @author Andreas Schluens # def run(sCmdLine): - printCopyright() - aCfg = ConfigHelper(CFGFILE, sCmdLine) + if aCfg.getValueWithDefault(PROP_VERBOSE,None) == None: + sys.stdout=None + + printCopyright() # help requested? if aCfg.isHelp(): @@ -349,7 +352,7 @@ class ConfigHelper: count = len(lCommandLineArgs) self.m_bEmpty = (count < 1) - print(lCommandLineArgs, "and len is", count) + # print(lCommandLineArgs, "and len is", count) for arg in range(count): # is it a named-value argument? # Note: We ignores double "=" signs! => search from left to right |