summaryrefslogtreecommitdiffstats
path: root/meta/classes/distrodata.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-30 14:20:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-30 14:21:29 +0100
commit0d9e89371158c4c329eebab3bc6609250b4c86c0 (patch)
tree3bc4b02ee601a1a4be6f7cf8c33a60251bde9032 /meta/classes/distrodata.bbclass
parentbc386b89345d1a4c941744f911065d498028d9d3 (diff)
downloadpoky-0d9e89371158c4c329eebab3bc6609250b4c86c0.tar.gz
Revert "meta: replace os.popen with subprocess.Popen"
This reverts commit e83d8e58a6b107eea87df0ec233a1bc932b2c6e as the conversion is not correct. Its replacing readlines() calls which generate an array with what are effectively strings. There are split("\n") calls missing in many cases so this needs to be reverted until it gets fixed. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/distrodata.bbclass')
-rw-r--r--meta/classes/distrodata.bbclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 7f9c83e7c7..df6d300666 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -564,10 +564,10 @@ python do_checkpkg() {
564 gitproto = parm['protocol'] 564 gitproto = parm['protocol']
565 else: 565 else:
566 gitproto = "git" 566 gitproto = "git"
567 gitcmd = "git ls-remote %s://%s%s%s *tag*" % (gitproto, gituser, host, path) 567 gitcmd = "git ls-remote %s://%s%s%s *tag* 2>&1" % (gitproto, gituser, host, path)
568 gitcmd2 = "git ls-remote %s://%s%s%s HEAD" % (gitproto, gituser, host, path) 568 gitcmd2 = "git ls-remote %s://%s%s%s HEAD 2>&1" % (gitproto, gituser, host, path)
569 tmp = bb.process.run(gitcmd)[0] 569 tmp = os.popen(gitcmd).read()
570 tmp2 = bb.process.run(gitcmd2)[0] 570 tmp2 = os.popen(gitcmd2).read()
571 #This is for those repo have tag like: refs/tags/1.2.2 571 #This is for those repo have tag like: refs/tags/1.2.2
572 if tmp: 572 if tmp:
573 tmpline = tmp.split("\n") 573 tmpline = tmp.split("\n")
@@ -613,9 +613,9 @@ python do_checkpkg() {
613 if 'rev' in parm: 613 if 'rev' in parm:
614 pcurver = parm['rev'] 614 pcurver = parm['rev']
615 615
616 svncmd = "svn info %s %s://%s%s/%s/" % (" ".join(options), svnproto, host, path, parm["module"]) 616 svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), svnproto, host, path, parm["module"])
617 print svncmd 617 print svncmd
618 svninfo = bb.process.run(svncmd)[0] 618 svninfo = os.popen(svncmd).read()
619 for line in svninfo.split("\n"): 619 for line in svninfo.split("\n"):
620 if re.search("^Last Changed Rev:", line): 620 if re.search("^Last Changed Rev:", line):
621 pupver = line.split(" ")[-1] 621 pupver = line.split(" ")[-1]