← Back to branch summary

~brian-murray/apport/xenial-snap

« back to all changes in this revision

Viewing changes to backends/packaging-snap.py

  • Committer: Brian Murray
  • Date: 2017-04-17 20:40:03 UTC
  • Revision ID: brian@canonical.com-20170417204003-quild8q5b9987xfu
Fix how the version is determined.

Show diffs side-by-side

added added

removed removed

Lines of Context:
backends/packaging-snap.py
37
37
            except OSError as e:
38
38
                return 'Error: ' + str(e)
39
39
 
40
 
            out = sp.communicate()[0]
 
40
            out = sp.communicate()[0].decode('UTF-8', errors='replace')
41
41
            if sp.returncode == 0:
42
42
                res = out.strip()
43
43
                for line in res.splitlines():
44
44
                    snap_name = line.split()[0]
45
45
                    version = line.split()[1]
46
 
                    if str(snap_name) == snap:
 
46
                    if snap_name == snap:
47
47
                        res = version
48
48
                        break
49
49
            else:
50
 
                res = (b'Error: command ' + str(command).encode() + b' failed with exit code ' +
51
 
                       str(sp.returncode).encode() + b': ' + out)
 
50
                res = ('Error: command ' + command + ' failed with exit code ' +
 
51
                       sp.returncode + ': ' + out)
52
52
            return res
53
53
        else:
54
54
            return 'Unknown'