diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-05 16:45:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-05 18:17:00 +0200 |
| commit | 267ddb1c291f391694f567874c9fe68fb0492931 (patch) | |
| tree | 35521d160edb02eb976d494f9228c83d150fa573 /filter/source | |
| parent | 791a8b96f754798192875da287c84f8cfa4e533e (diff) | |
fdo#68552: try different build-time replacement
Replace the offending variable at build time in pyAltFCFGMerge.
Change-Id: Ie96d780eed8325c6f8399e78025345c0f0369856
Diffstat (limited to 'filter/source')
| -rwxr-xr-x | filter/source/config/tools/merge/pyAltFCFGMerge | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge index ca0e06457691..e6e982564c71 100755 --- a/filter/source/config/tools/merge/pyAltFCFGMerge +++ b/filter/source/config/tools/merge/pyAltFCFGMerge @@ -40,6 +40,7 @@ PROP_LCFG = "lcfg" # // <= cmdline PROP_CCFG = "ccfg" # // <= cmdline PROP_LANGUAGEPACK = "languagepack" # // <= cmdline PROP_VERBOSE = "verbose" # // <= cmdline +PROP_SHARE_SUBDIR_NAME = "share_subdir_name" # // <= cmdline PROP_ITEMS = "items" # // <= pkg cfg files! #---begin java.util.Properties copy---# @@ -378,7 +379,7 @@ class ConfigHelper: sArg = lCommandLineArgs[arg][pos + 1:] self.props[sArg] = 1 continue - + raise Exception("Invalid command line detected. The argument \"" + \ lCommandLineArgs[arg] + "\" use an unsupported format.") @@ -555,6 +556,9 @@ class Merger: def getFragments(self, aDir, sSetName, lFragments, nPrettyTabs): sBuffer = '' sExtXcu = self.m_aCfg.getValue(PROP_EXTENSION_XCU); + sShareSubdirName = self.m_aCfg.getValue(PROP_SHARE_SUBDIR_NAME) + if len(sShareSubdirName) < 1: + raise Exception("no share subdir set") if len(lFragments) < 1: return sBuffer @@ -572,7 +576,9 @@ class Merger: # handle simple files only and check for existence! raise Exception("fragment \"" + sFragPath + "\" does not exists.") printOut("merge fragment \"" + sFragPath + "\" ...") - sBuffer = sBuffer + aFragmentFile.read() + data = aFragmentFile.read() + data = data.replace("$(share_subdir_name)", sShareSubdirName) + sBuffer = sBuffer + data sBuffer = sBuffer + "\n" nPrettyTabs = nPrettyTabs - 1 |