mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

distrodata.bbclass: Remove whitespaces

Browse Source 
(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>
This commit is contained in:
Emilia Ciobanu
2013-07-26 18:58:18 +03:00
committed by Richard Purdie
parent b099c7b36e
commit 280b9a3b57
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/distrodata.bbclass
+9 -9
View File
@@ -71,7 +71,7 @@ python do_distrodata_np() {
rstatus = localdata.getVar('RECIPE_COLOR', True) rstatus = localdata.getVar('RECIPE_COLOR', True)
if rstatus is not None: if rstatus is not None:
rstatus = rstatus.replace(',','') rstatus = rstatus.replace(',','')
pupver = localdata.getVar('RECIPE_UPSTREAM_VERSION', True) pupver = localdata.getVar('RECIPE_UPSTREAM_VERSION', True)
if pcurver == pupver: if pcurver == pupver:
vermatch="1" vermatch="1"
@@ -157,7 +157,7 @@ python do_distrodata() {
rstatus = localdata.getVar('RECIPE_COLOR', True) rstatus = localdata.getVar('RECIPE_COLOR', True)
if rstatus is not None: if rstatus is not None:
rstatus = rstatus.replace(',','') rstatus = rstatus.replace(',','')
pupver = localdata.getVar('RECIPE_UPSTREAM_VERSION', True) pupver = localdata.getVar('RECIPE_UPSTREAM_VERSION', True)
if pcurver == pupver: if pcurver == pupver:
vermatch="1" vermatch="1"
@@ -408,7 +408,7 @@ python do_checkpkg() {
s = "%s[^\d\"]*?(\d+[\.\-_])+\d+/?" % m.group() s = "%s[^\d\"]*?(\d+[\.\-_])+\d+/?" % m.group()
else: else:
s = "(\d+[\.\-_])+\d+/?" s = "(\d+[\.\-_])+\d+/?"
searchstr = "[hH][rR][eE][fF]=\"%s\">" % s searchstr = "[hH][rR][eE][fF]=\"%s\">" % s
reg = re.compile(searchstr) reg = re.compile(searchstr)
@@ -599,17 +599,17 @@ python do_checkpkg() {
altpath = path altpath = path
dirver = "-" dirver = "-"
curname = "-" curname = "-"
""" """
match version number amid the path, such as "5.7" in: match version number amid the path, such as "5.7" in:
http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz
N.B. how about sth. like "../5.7/5.8/..."? Not find such example so far :-P N.B. how about sth. like "../5.7/5.8/..."? Not find such example so far :-P
""" """
m = re.search(r"[^/]*(\d+\.)+\d+([\-_]r\d+)*/", path) m = re.search(r"[^/]*(\d+\.)+\d+([\-_]r\d+)*/", path)
if m: if m:
altpath = path.split(m.group())[0] altpath = path.split(m.group())[0]
dirver = m.group().strip("/") dirver = m.group().strip("/")
"""use new path and remove param. for wget only param is md5sum""" """use new path and remove param. for wget only param is md5sum"""
alturi = bb.encodeurl([type, host, altpath, user, pswd, {}]) alturi = bb.encodeurl([type, host, altpath, user, pswd, {}])
my_uri = d.getVar('REGEX_URI', True) my_uri = d.getVar('REGEX_URI', True)
@@ -624,7 +624,7 @@ python do_checkpkg() {
"""Now try to acquire all remote files in current directory""" """Now try to acquire all remote files in current directory"""
if not re.match("Err", newver): if not re.match("Err", newver):
curname = altpath.split("/")[-1] curname = altpath.split("/")[-1]
"""get remote name by skipping pacakge name""" """get remote name by skipping pacakge name"""
m = re.search(r"/.*/", altpath) m = re.search(r"/.*/", altpath)
if not m: if not m:
@@ -650,7 +650,7 @@ python do_checkpkg() {
pstatus = "UPDATE" pstatus = "UPDATE"
else: else:
pstatus = "MATCH" pstatus = "MATCH"
if re.match("Err", newver): if re.match("Err", newver):
pstatus = newver + ":" + altpath + ":" + dirver + ":" + curname pstatus = newver + ":" + altpath + ":" + dirver + ":" + curname
elif type == 'git': elif type == 'git':
@@ -796,7 +796,7 @@ python do_checkpkg() {
pmstatus = "MATCH" pmstatus = "MATCH"
else: else:
pmstatus = "UPDATE" pmstatus = "UPDATE"
psrcuri = psrcuri.split()[0] psrcuri = psrcuri.split()[0]
pdepends = "".join(pdepends.split("\t")) pdepends = "".join(pdepends.split("\t"))
pdesc = "".join(pdesc.split("\t")) pdesc = "".join(pdesc.split("\t"))