diff options
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/recipetool/create.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 99d9cc850e..409b255f5f 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
| @@ -23,6 +23,7 @@ import fnmatch | |||
| 23 | import re | 23 | import re |
| 24 | import logging | 24 | import logging |
| 25 | import scriptutils | 25 | import scriptutils |
| 26 | import urlparse | ||
| 26 | 27 | ||
| 27 | logger = logging.getLogger('recipetool') | 28 | logger = logging.getLogger('recipetool') |
| 28 | 29 | ||
| @@ -102,7 +103,8 @@ def create_recipe(args): | |||
| 102 | srcrev = '${AUTOREV}' | 103 | srcrev = '${AUTOREV}' |
| 103 | if '://' in args.source: | 104 | if '://' in args.source: |
| 104 | # Fetch a URL | 105 | # Fetch a URL |
| 105 | srcuri = args.source | 106 | fetchuri = urlparse.urldefrag(args.source)[0] |
| 107 | srcuri = fetchuri | ||
| 106 | rev_re = re.compile(';rev=([^;]+)') | 108 | rev_re = re.compile(';rev=([^;]+)') |
| 107 | res = rev_re.search(srcuri) | 109 | res = rev_re.search(srcuri) |
| 108 | if res: | 110 | if res: |
| @@ -111,7 +113,7 @@ def create_recipe(args): | |||
| 111 | tempsrc = tempfile.mkdtemp(prefix='recipetool-') | 113 | tempsrc = tempfile.mkdtemp(prefix='recipetool-') |
| 112 | srctree = tempsrc | 114 | srctree = tempsrc |
| 113 | logger.info('Fetching %s...' % srcuri) | 115 | logger.info('Fetching %s...' % srcuri) |
| 114 | checksums = scriptutils.fetch_uri(tinfoil.config_data, args.source, srctree, srcrev) | 116 | checksums = scriptutils.fetch_uri(tinfoil.config_data, fetchuri, srctree, srcrev) |
| 115 | dirlist = os.listdir(srctree) | 117 | dirlist = os.listdir(srctree) |
| 116 | if 'git.indirectionsymlink' in dirlist: | 118 | if 'git.indirectionsymlink' in dirlist: |
| 117 | dirlist.remove('git.indirectionsymlink') | 119 | dirlist.remove('git.indirectionsymlink') |
