diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 14:20:04 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 14:20:04 +0100 |
| commit | f5356062443320c29a19cfd7113128caa185b221 (patch) | |
| tree | e1458660ec06896311c93ac6f17b1b4c5afc24c5 /meta/classes/distrodata.bbclass | |
| parent | 004ba67298e3e6e618df29597e9166c971a1941c (diff) | |
| download | openembedded-core-contrib-f5356062443320c29a19cfd7113128caa185b221.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.
Diffstat (limited to 'meta/classes/distrodata.bbclass')
| -rw-r--r-- | meta/classes/distrodata.bbclass | 12 |
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() { gitproto = parm['protocol'] else: gitproto = "git" - gitcmd = "git ls-remote %s://%s%s%s *tag*" % (gitproto, gituser, host, path) - gitcmd2 = "git ls-remote %s://%s%s%s HEAD" % (gitproto, gituser, host, path) - tmp = bb.process.run(gitcmd)[0] - tmp2 = bb.process.run(gitcmd2)[0] + gitcmd = "git ls-remote %s://%s%s%s *tag* 2>&1" % (gitproto, gituser, host, path) + gitcmd2 = "git ls-remote %s://%s%s%s HEAD 2>&1" % (gitproto, gituser, host, path) + tmp = os.popen(gitcmd).read() + tmp2 = os.popen(gitcmd2).read() #This is for those repo have tag like: refs/tags/1.2.2 if tmp: tmpline = tmp.split("\n") @@ -613,9 +613,9 @@ python do_checkpkg() { if 'rev' in parm: pcurver = parm['rev'] - svncmd = "svn info %s %s://%s%s/%s/" % (" ".join(options), svnproto, host, path, parm["module"]) + svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), svnproto, host, path, parm["module"]) print svncmd - svninfo = bb.process.run(svncmd)[0] + svninfo = os.popen(svncmd).read() for line in svninfo.split("\n"): if re.search("^Last Changed Rev:", line): pupver = line.split(" ")[-1] |