Skip to contentSkip to conversation

recipetool: create: fix incorrect URL variable usage

PATCH New Paul Eggleton 1 participant 2 messages Aug 15, 2017

lore
Share & tools
lore
#0 lore raw

cover recipetool: create: fix incorrect URL variable usage

The following changes since commit 5a25ed1071f0d9b7d95edcc2b5b4545f960d5f95:

image-prelink: Disable for musl images (2017-08-11 08:14:19 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/recipetool-fetchuri
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/recipetool-fetchuri

Paul Eggleton (1):
recipetool: create: fix incorrect URL variable usage

 scripts/lib/recipetool/create.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.9.5
#1 lore raw

PATCH 1/1 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.

---
 scripts/lib/recipetool/create.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/recipetool/create.py +1 -1
index 359eb9a..e21e2bf 100644
@@ -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)
Signature · 1 line
2.9.5