diff options
| author |   Michael Wood <michael.g.wood@intel.com> | 2016-03-23 08:28:40 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-23 17:53:51 +0000 |
| commit | 238db2e03405d259d48dfc477a276191e6a47698 (patch) | |
| tree | 4a60aad721ea879038d954e60a451352ed0a91f7 /lib/toaster/orm/models.py | |
| parent | 77f3728ee6ea379bffcf73f33c26e982cb0795f4 (diff) | |
| download | bitbake-238db2e03405d259d48dfc477a276191e6a47698.tar.gz | |
toaster: orm generate CustomImageRecipe contents try secondary path
Try a secondary file path if the first does not exist. When we get the
recipe paths and layer information from the layer index it is not a
complete path but we are usually able to reconstruct it. If the complete
real path has been discovered by building then use this instead.
[YOCTO #9206]
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/toaster/orm/models.py')
| -rw-r--r-- | lib/toaster/orm/models.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 0aad788c2..08b1a7ca0 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -1534,10 +1534,13 @@ class CustomImageRecipe(Recipe): packages_conf += pkg.name+' ' packages_conf += "\"" - - base_recipe = open("%s/%s" % - (self.base_recipe.layer_version.dirpath, - self.base_recipe.file_path), 'r').read() + try: + base_recipe = open("%s/%s" % + (self.base_recipe.layer_version.dirpath, + self.base_recipe.file_path), 'r').read() + except IOError: + # The path may now be the full path if the recipe has been built + base_recipe = open(self.base_recipe.file_path, 'r').read() # Add a special case for when the recipe we have based a custom image # recipe on requires another recipe. |