~hopem/charms/trusty/nova-cloud-controller/lp1499435

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/core/host.py

  • Committer: Corey Bryant
  • Date: 2015-06-10 15:48:34 UTC
  • mfrom: (164 nova-cloud-controller)
  • mto: This revision was merged to the branch mainline in revision 166.
  • Revision ID: corey.bryant@canonical.com-20150610154834-6kewh5nhou2b3y1i
Merge next branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
90
90
            ['service', service_name, 'status'],
91
91
            stderr=subprocess.STDOUT).decode('UTF-8')
92
92
    except subprocess.CalledProcessError as e:
93
 
        return 'unrecognized service' not in e.output
 
93
        return b'unrecognized service' not in e.output
94
94
    else:
95
95
        return True
96
96