diff options
| author |   Michael Wood <michael.g.wood@intel.com> | 2015-06-19 11:24:21 +0100 |
|---|---|---|
| committer |   Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-06-25 11:10:07 +0100 |
| commit | 2f74ff59f2873c1cf121f7a385f3ab971c793a9c (patch) | |
| tree | 541a21a684bae6dcafcad6d8c6f38e4e6cbb49ca | |
| parent | 04a3e4614aae8ba794a3b8ac9083e723de7ca522 (diff) | |
| download | bitbake-2f74ff59f2873c1cf121f7a385f3ab971c793a9c.tar.gz | |
toaster: bldcontrol Ignore toasterconf files in own directories
If toaster has previously cloned poky or a layer with a toasterconf
file we don't want this to be picked up as a choice as these clones are
"internal" to toaster and may have undesired effects on toaster's setup.
[YOCTO #7741]
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
| -rw-r--r-- | lib/toaster/bldcontrol/management/commands/checksettings.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/toaster/bldcontrol/management/commands/checksettings.py b/lib/toaster/bldcontrol/management/commands/checksettings.py index 3c524464f..3002e4c2a 100644 --- a/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/lib/toaster/bldcontrol/management/commands/checksettings.py @@ -166,6 +166,8 @@ class Command(NoArgsCommand): conffilepath, error = subprocess.Popen('bash -c ". '+os.path.join(dirname, ".templateconf")+'; echo \"\$TEMPLATECONF\""', shell=True, stdout=subprocess.PIPE).communicate() conffilepath = os.path.join(conffilepath.strip(), "toasterconf.json") candidatefilepath = os.path.join(dirname, conffilepath) + if "toaster_cloned" in candidatefilepath: + continue if os.path.exists(candidatefilepath): config_files.append(candidatefilepath) |