diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-12-04 14:59:26 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-08 10:20:24 +0000 |
| commit | f0a9e783f9969573fd74edfa241ef14f18ac684e (patch) | |
| tree | ec6f121ef7b89fcc3730a2b944d69147b7a25fb5 /lib/bb/fetch2 | |
| parent | f7b33a95b5d53973bc673373bdd2652f4d32f0c2 (diff) | |
| download | openembedded-core-contrib-f0a9e783f9969573fd74edfa241ef14f18ac684e.tar.gz | |
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.
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 'lib/bb/fetch2')
| -rw-r--r-- | lib/bb/fetch2/git.py | 2 | ||||
| -rw-r--r-- | lib/bb/fetch2/wget.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index 9bd87ad25c..5ffab22056 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -379,7 +379,7 @@ class Git(FetchMethod): """ pupver = ('', '') - tagregex = re.compile(d.getVar('GITTAGREGEX', True) or "(?P<pver>([0-9][\.|_]?)+)") + tagregex = re.compile(d.getVar('UPSTREAM_CHECK_GITTAGREGEX', True) or "(?P<pver>([0-9][\.|_]?)+)") try: output = self._lsremote(ud, d, "refs/tags/*") except bb.fetch2.FetchError or bb.fetch2.NetworkAccess: diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py index c185f5b5f4..c8c6d5ce83 100644 --- a/lib/bb/fetch2/wget.py +++ b/lib/bb/fetch2/wget.py @@ -481,7 +481,7 @@ class Wget(FetchMethod): self.suffix_regex_comp = re.compile(psuffix_regex) # compile regex, can be specific by package or generic regex - pn_regex = d.getVar('REGEX', True) + pn_regex = d.getVar('UPSTREAM_CHECK_REGEX', True) if pn_regex: package_custom_regex_comp = re.compile(pn_regex) else: @@ -517,7 +517,7 @@ class Wget(FetchMethod): bb.debug(3, "latest_versionstring, regex: %s" % (package_regex.pattern)) uri = "" - regex_uri = d.getVar("REGEX_URI", True) + regex_uri = d.getVar("UPSTREAM_CHECK_URI", True) if not regex_uri: path = ud.path.split(package)[0] |