diff options
| author | Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com> | 2013-07-26 18:58:18 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-31 06:59:57 +0100 |
| commit | 280b9a3b57d3f3bd5ce04e9da7aa1fb41d78c310 (patch) | |
| tree | b1d5007cb7b1750a76eb4ce1e78c115c8926ccd1 /meta/classes | |
| parent | b099c7b36e6a61559a6af1b6e6853fecf0e79606 (diff) | |
| download | poky-280b9a3b57d3f3bd5ce04e9da7aa1fb41d78c310.tar.gz | |
distrodata.bbclass: Remove whitespaces
(From OE-Core rev: 2275dd9507fa7b8c3e62ffcf8b9b16120f16fe8f)
Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/distrodata.bbclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index 204612c378..1774dc035d 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass | |||
| @@ -71,7 +71,7 @@ python do_distrodata_np() { | |||
| 71 | rstatus = localdata.getVar('RECIPE_COLOR', True) | 71 | rstatus = localdata.getVar('RECIPE_COLOR', True) |
| 72 | if rstatus is not None: | 72 | if rstatus is not None: |
| 73 | rstatus = rstatus.replace(',','') | 73 | rstatus = rstatus.replace(',','') |
| 74 | 74 | ||
| 75 | pupver = localdata.getVar('RECIPE_UPSTREAM_VERSION', True) | 75 | pupver = localdata.getVar('RECIPE_UPSTREAM_VERSION', True) |
| 76 | if pcurver == pupver: | 76 | if pcurver == pupver: |
| 77 | vermatch="1" | 77 | vermatch="1" |
| @@ -157,7 +157,7 @@ python do_distrodata() { | |||
| 157 | rstatus = localdata.getVar('RECIPE_COLOR', True) | 157 | rstatus = localdata.getVar('RECIPE_COLOR', True) |
| 158 | if rstatus is not None: | 158 | if rstatus is not None: |
| 159 | rstatus = rstatus.replace(',','') | 159 | rstatus = rstatus.replace(',','') |
| 160 | 160 | ||
| 161 | pupver = localdata.getVar('RECIPE_UPSTREAM_VERSION', True) | 161 | pupver = localdata.getVar('RECIPE_UPSTREAM_VERSION', True) |
| 162 | if pcurver == pupver: | 162 | if pcurver == pupver: |
| 163 | vermatch="1" | 163 | vermatch="1" |
| @@ -408,7 +408,7 @@ python do_checkpkg() { | |||
| 408 | s = "%s[^\d\"]*?(\d+[\.\-_])+\d+/?" % m.group() | 408 | s = "%s[^\d\"]*?(\d+[\.\-_])+\d+/?" % m.group() |
| 409 | else: | 409 | else: |
| 410 | s = "(\d+[\.\-_])+\d+/?" | 410 | s = "(\d+[\.\-_])+\d+/?" |
| 411 | 411 | ||
| 412 | searchstr = "[hH][rR][eE][fF]=\"%s\">" % s | 412 | searchstr = "[hH][rR][eE][fF]=\"%s\">" % s |
| 413 | 413 | ||
| 414 | reg = re.compile(searchstr) | 414 | reg = re.compile(searchstr) |
| @@ -599,17 +599,17 @@ python do_checkpkg() { | |||
| 599 | altpath = path | 599 | altpath = path |
| 600 | dirver = "-" | 600 | dirver = "-" |
| 601 | curname = "-" | 601 | curname = "-" |
| 602 | 602 | ||
| 603 | """ | 603 | """ |
| 604 | match version number amid the path, such as "5.7" in: | 604 | match version number amid the path, such as "5.7" in: |
| 605 | http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz | 605 | http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz |
| 606 | N.B. how about sth. like "../5.7/5.8/..."? Not find such example so far :-P | 606 | N.B. how about sth. like "../5.7/5.8/..."? Not find such example so far :-P |
| 607 | """ | 607 | """ |
| 608 | m = re.search(r"[^/]*(\d+\.)+\d+([\-_]r\d+)*/", path) | 608 | m = re.search(r"[^/]*(\d+\.)+\d+([\-_]r\d+)*/", path) |
| 609 | if m: | 609 | if m: |
| 610 | altpath = path.split(m.group())[0] | 610 | altpath = path.split(m.group())[0] |
| 611 | dirver = m.group().strip("/") | 611 | dirver = m.group().strip("/") |
| 612 | 612 | ||
| 613 | """use new path and remove param. for wget only param is md5sum""" | 613 | """use new path and remove param. for wget only param is md5sum""" |
| 614 | alturi = bb.encodeurl([type, host, altpath, user, pswd, {}]) | 614 | alturi = bb.encodeurl([type, host, altpath, user, pswd, {}]) |
| 615 | my_uri = d.getVar('REGEX_URI', True) | 615 | my_uri = d.getVar('REGEX_URI', True) |
| @@ -624,7 +624,7 @@ python do_checkpkg() { | |||
| 624 | """Now try to acquire all remote files in current directory""" | 624 | """Now try to acquire all remote files in current directory""" |
| 625 | if not re.match("Err", newver): | 625 | if not re.match("Err", newver): |
| 626 | curname = altpath.split("/")[-1] | 626 | curname = altpath.split("/")[-1] |
| 627 | 627 | ||
| 628 | """get remote name by skipping pacakge name""" | 628 | """get remote name by skipping pacakge name""" |
| 629 | m = re.search(r"/.*/", altpath) | 629 | m = re.search(r"/.*/", altpath) |
| 630 | if not m: | 630 | if not m: |
| @@ -650,7 +650,7 @@ python do_checkpkg() { | |||
| 650 | pstatus = "UPDATE" | 650 | pstatus = "UPDATE" |
| 651 | else: | 651 | else: |
| 652 | pstatus = "MATCH" | 652 | pstatus = "MATCH" |
| 653 | 653 | ||
| 654 | if re.match("Err", newver): | 654 | if re.match("Err", newver): |
| 655 | pstatus = newver + ":" + altpath + ":" + dirver + ":" + curname | 655 | pstatus = newver + ":" + altpath + ":" + dirver + ":" + curname |
| 656 | elif type == 'git': | 656 | elif type == 'git': |
| @@ -796,7 +796,7 @@ python do_checkpkg() { | |||
| 796 | pmstatus = "MATCH" | 796 | pmstatus = "MATCH" |
| 797 | else: | 797 | else: |
| 798 | pmstatus = "UPDATE" | 798 | pmstatus = "UPDATE" |
| 799 | 799 | ||
| 800 | psrcuri = psrcuri.split()[0] | 800 | psrcuri = psrcuri.split()[0] |
| 801 | pdepends = "".join(pdepends.split("\t")) | 801 | pdepends = "".join(pdepends.split("\t")) |
| 802 | pdesc = "".join(pdesc.split("\t")) | 802 | pdesc = "".join(pdesc.split("\t")) |
