diff options
| -rw-r--r-- | meta-ruby/classes/ruby.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-ruby/classes/ruby.bbclass b/meta-ruby/classes/ruby.bbclass index ef844f2d96..1acf2e0bd2 100644 --- a/meta-ruby/classes/ruby.bbclass +++ b/meta-ruby/classes/ruby.bbclass | |||
| @@ -18,7 +18,7 @@ def get_rubyversion(p): | |||
| 18 | if not isfile(cmd): | 18 | if not isfile(cmd): |
| 19 | return found_version | 19 | return found_version |
| 20 | 20 | ||
| 21 | version = subprocess.Popen([cmd, "--version"], stdout=subprocess.PIPE).communicate()[0] | 21 | version = subprocess.Popen([cmd, "--version"], stdout=subprocess.PIPE).communicate()[0].decode("utf-8") |
| 22 | 22 | ||
| 23 | r = re.compile("ruby ([0-9]+\.[0-9]+\.[0-9]+)*") | 23 | r = re.compile("ruby ([0-9]+\.[0-9]+\.[0-9]+)*") |
| 24 | m = r.match(version) | 24 | m = r.match(version) |
| @@ -38,7 +38,7 @@ def get_rubygemslocation(p): | |||
| 38 | if not isfile(cmd): | 38 | if not isfile(cmd): |
| 39 | return found_loc | 39 | return found_loc |
| 40 | 40 | ||
| 41 | loc = subprocess.Popen([cmd, "env"], stdout=subprocess.PIPE).communicate()[0] | 41 | loc = subprocess.Popen([cmd, "env"], stdout=subprocess.PIPE).communicate()[0].decode("utf-8") |
| 42 | 42 | ||
| 43 | r = re.compile(".*\- (/usr.*/ruby/gems/.*)") | 43 | r = re.compile(".*\- (/usr.*/ruby/gems/.*)") |
| 44 | for line in loc.split('\n'): | 44 | for line in loc.split('\n'): |
| @@ -60,7 +60,7 @@ def get_rubygemsversion(p): | |||
| 60 | if not isfile(cmd): | 60 | if not isfile(cmd): |
| 61 | return found_version | 61 | return found_version |
| 62 | 62 | ||
| 63 | version = subprocess.Popen([cmd, "env", "gemdir"], stdout=subprocess.PIPE).communicate()[0] | 63 | version = subprocess.Popen([cmd, "env", "gemdir"], stdout=subprocess.PIPE).communicate()[0].decode("utf-8") |
| 64 | 64 | ||
| 65 | r = re.compile(".*([0-9]+\.[0-9]+\.[0-9]+)$") | 65 | r = re.compile(".*([0-9]+\.[0-9]+\.[0-9]+)$") |
| 66 | m = r.match(version) | 66 | m = r.match(version) |