diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-23 10:06:50 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:03 +0000 |
| commit | 9b7d45cf48dcda53f59a11e0d0cffe7ab226dc26 (patch) | |
| tree | 32f4337c4d4f9c63f021404c625d32b38fa8bb16 /scripts | |
| parent | 9a704441b7a40e93626af606cb51c282a8f66850 (diff) | |
| download | poky-9b7d45cf48dcda53f59a11e0d0cffe7ab226dc26.tar.gz | |
devtool: upgrade: remove erroneous error when not renaming recipe
If we're upgrading a git recipe the recipe file usually won't need
renaming; for some unknown reason we were throwing an error here which
isn't correct.
(From OE-Core rev: 656348dff9bc9dd1cafc8fff11e5e374e3667f0f)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/upgrade.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 14eff665b6..8851a6edbe 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py | |||
| @@ -117,7 +117,6 @@ def _rename_recipe_file(bpn, oldpv, newpv, path): | |||
| 117 | recipe = "%s_git.bb" % bpn | 117 | recipe = "%s_git.bb" % bpn |
| 118 | if os.path.isfile(os.path.join(path, recipe)): | 118 | if os.path.isfile(os.path.join(path, recipe)): |
| 119 | newrecipe = recipe | 119 | newrecipe = recipe |
| 120 | raise DevtoolError("Original recipe not found on workspace") | ||
| 121 | return os.path.join(path, newrecipe) | 120 | return os.path.join(path, newrecipe) |
| 122 | 121 | ||
| 123 | def _rename_recipe_files(bpn, oldpv, newpv, path): | 122 | def _rename_recipe_files(bpn, oldpv, newpv, path): |