summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-12-04 14:59:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:31 +0000
commit3745479596d50ced74053b612a2b320361b882cd (patch)
tree1e557e7416e5886567eafbdf20c9b036cff6a107 /bitbake/lib/bb/fetch2
parentdd282d475cb4fde4f4e6fd7afe437dc001584587 (diff)
downloadpoky-3745479596d50ced74053b612a2b320361b882cd.tar.gz
bitbake: bitbake: rename REGEX, REGEX_URI, and GITTAGREGEX.
Rename REGEX to UPSTREAM_CHECK_REGEX, REGEX_URI to UPSTREAM_CHECK_URI, and GITTAGREGEX to UPSTREAM_CHECK_GITTAGREGEX to better reflect their purpose and to reflect a common namespace. (Bitbake rev: f0a9e783f9969573fd74edfa241ef14f18ac684e) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/git.py2
-rw-r--r--bitbake/lib/bb/fetch2/wget.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 9bd87ad25c..5ffab22056 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -379,7 +379,7 @@ class Git(FetchMethod):
379 """ 379 """
380 pupver = ('', '') 380 pupver = ('', '')
381 381
382 tagregex = re.compile(d.getVar('GITTAGREGEX', True) or "(?P<pver>([0-9][\.|_]?)+)") 382 tagregex = re.compile(d.getVar('UPSTREAM_CHECK_GITTAGREGEX', True) or "(?P<pver>([0-9][\.|_]?)+)")
383 try: 383 try:
384 output = self._lsremote(ud, d, "refs/tags/*") 384 output = self._lsremote(ud, d, "refs/tags/*")
385 except bb.fetch2.FetchError or bb.fetch2.NetworkAccess: 385 except bb.fetch2.FetchError or bb.fetch2.NetworkAccess:
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index c185f5b5f4..c8c6d5ce83 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -481,7 +481,7 @@ class Wget(FetchMethod):
481 self.suffix_regex_comp = re.compile(psuffix_regex) 481 self.suffix_regex_comp = re.compile(psuffix_regex)
482 482
483 # compile regex, can be specific by package or generic regex 483 # compile regex, can be specific by package or generic regex
484 pn_regex = d.getVar('REGEX', True) 484 pn_regex = d.getVar('UPSTREAM_CHECK_REGEX', True)
485 if pn_regex: 485 if pn_regex:
486 package_custom_regex_comp = re.compile(pn_regex) 486 package_custom_regex_comp = re.compile(pn_regex)
487 else: 487 else:
@@ -517,7 +517,7 @@ class Wget(FetchMethod):
517 bb.debug(3, "latest_versionstring, regex: %s" % (package_regex.pattern)) 517 bb.debug(3, "latest_versionstring, regex: %s" % (package_regex.pattern))
518 518
519 uri = "" 519 uri = ""
520 regex_uri = d.getVar("REGEX_URI", True) 520 regex_uri = d.getVar("UPSTREAM_CHECK_URI", True)
521 if not regex_uri: 521 if not regex_uri:
522 path = ud.path.split(package)[0] 522 path = ud.path.split(package)[0]
523 523