diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-23 10:06:50 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-12 08:42:30 +0000 |
| commit | d2134528a6c6db6395e2ca5bcf859b36cf255435 (patch) | |
| tree | e424d1c446d82fd90891e096828211b5d817a1b2 /scripts | |
| parent | fec97f6fa24f810b175feb43ef6ed0d47e73460e (diff) | |
| download | poky-d2134528a6c6db6395e2ca5bcf859b36cf255435.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 master rev: 656348dff9bc9dd1cafc8fff11e5e374e3667f0f)
(From OE-Core rev: 9816c0a2ad2c1011e298d734576b531de9947740)
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 ace0b76be0..f033fc8010 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): |