[oe-commits] [openembedded-core] 10/33: recipetool: create: fix incorrect URL variable usage

git at git.openembedded.org git at git.openembedded.org
Tue Aug 15 23:19:45 UTC 2017


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit b66b73bcf5ee7e4488970576fdc31dfa25b35f5e
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Tue Aug 15 16:07:17 2017 +1200

    recipetool: create: fix incorrect URL variable usage
    
    We have two variables here, srcuri and fetchuri. srcuri is what
    eventually ends up in the recipe, whereas fetchuri is what we actually
    pass to the fetcher when we fetch the source within recipetool -
    sometimes these need to be different particularly for an upcoming patch
    to handle automatically setting the branch parameter. In OE-Core
    revision 9a47a6690052ef943c0d4760630ee630fb012153 I erroneously changed
    the call to scriptutils.fetch_url() to pass srcuri instead of fetchuri -
    this likely didn't have any ill effect, but change it back to passing
    fetchuri to match the original intent.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/recipetool/create.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 359eb9a..e21e2bf 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -446,7 +446,7 @@ def create_recipe(args):
         srctree = os.path.join(tempsrc, 'source')
 
         try:
-            checksums, ftmpdir = scriptutils.fetch_url(tinfoil, srcuri, srcrev, srctree, logger, preserve_tmp=args.keep_temp)
+            checksums, ftmpdir = scriptutils.fetch_url(tinfoil, fetchuri, srcrev, srctree, logger, preserve_tmp=args.keep_temp)
         except scriptutils.FetchUrlFailure as e:
             logger.error(str(e))
             sys.exit(1)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list