← Back to branch summary

~ubuntu-branches/ubuntu/vivid/juju/vivid

« back to all changes in this revision

Viewing changes to juju/providers/maas/provider.py

  • Committer: Package Import Robot
  • Author(s): Martin Packman, Clint Byrum, Mark Mims, Martin Packman
  • Date: 2013-04-10 13:57:21 UTC
  • mfrom: (1.1.24)
  • Revision ID: package-import@ubuntu.com-20130410135721-s87t2g5pxe4yxk85
Tags: 0.7-0ubuntu1
https://launchpad.net/bugs/1167921
https://launchpad.net/bugs/1130809
[ Clint Byrum ]
* d/p/fix-tests-do-not-use-etc-lsb-release: Dropped, patch applied upstream.
* d/p/maas-tag-conversion.patch: Dropped, patch applied upstream.
* d/juju.docs: Remove examples as they have been dropped upstream.

[ Mark Mims ]
* Add postinst and prerm scripts using update-alternatives to install into
  a versioned location, enabling co-installability with the go juju port.

[ Martin Packman ]
* New upstream release. (lp: #1167921)
* d/p/workaround-lxc-python-env.patch: Workaround regression with local
  provider failing with SyntaxError on running lxc scripts when user has
  Python 3 specific environment variables set. (lp: #1130809)

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/providers/maas/provider.py
45
45
            if tag not in self.tag_names:
46
46
                raise ValueError("tag %r does not exist" % (tag,))
47
47
            tags.add(tag)
48
 
        return tag_expression
 
48
        return tags
49
49
 
50
50
 
51
51
class MachineProvider(MachineProviderBase):
79
79
        tags_info = yield self.maas_client.list_tags()
80
80
        handler = _TagHandler(tags_info)
81
81
        cs.register("maas-tags", converter=handler.convert,
82
 
            comparer=handler.compare)
 
82
                    comparer=handler.compare)
83
83
        returnValue(cs)
84
84
 
85
85
    def get_serialization_data(self):