diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-14 15:50:51 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-16 15:35:07 +0000 |
| commit | e5455662a9762fc2cb8859134d855413d84fd265 (patch) | |
| tree | ad7c3c6b258415ab9b92ed4b04a1ce0c2f6c9eb7 /bitbake/lib/bb/fetch2/git.py | |
| parent | ca4a8eea6284aad41ec67b375c2a7c7855b5fe11 (diff) | |
| download | poky-e5455662a9762fc2cb8859134d855413d84fd265.tar.gz | |
bitbake: bitbake: Fix Deprecated warnings from regexs
Fix handling of escape characters in regexs and hence fix python
Deprecation warnings which will be problematic in python 3.8.
(Bitbake rev: c1fcc46e2498ddd41425d8756754f814d682aba3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/git.py')
| -rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index 59a2ee8f80..c3c089233b 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py | |||
| @@ -615,7 +615,7 @@ class Git(FetchMethod): | |||
| 615 | """ | 615 | """ |
| 616 | pupver = ('', '') | 616 | pupver = ('', '') |
| 617 | 617 | ||
| 618 | tagregex = re.compile(d.getVar('UPSTREAM_CHECK_GITTAGREGEX') or "(?P<pver>([0-9][\.|_]?)+)") | 618 | tagregex = re.compile(d.getVar('UPSTREAM_CHECK_GITTAGREGEX') or r"(?P<pver>([0-9][\.|_]?)+)") |
| 619 | try: | 619 | try: |
| 620 | output = self._lsremote(ud, d, "refs/tags/*") | 620 | output = self._lsremote(ud, d, "refs/tags/*") |
| 621 | except (bb.fetch2.FetchError, bb.fetch2.NetworkAccess) as e: | 621 | except (bb.fetch2.FetchError, bb.fetch2.NetworkAccess) as e: |
| @@ -630,7 +630,7 @@ class Git(FetchMethod): | |||
| 630 | 630 | ||
| 631 | tag_head = line.split("/")[-1] | 631 | tag_head = line.split("/")[-1] |
| 632 | # Ignore non-released branches | 632 | # Ignore non-released branches |
| 633 | m = re.search("(alpha|beta|rc|final)+", tag_head) | 633 | m = re.search(r"(alpha|beta|rc|final)+", tag_head) |
| 634 | if m: | 634 | if m: |
| 635 | continue | 635 | continue |
| 636 | 636 | ||
