← Back to branch summary

~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to jujupy.py

  • Committer: Aaron Bentley
  • Date: 2013-12-06 21:28:33 UTC
  • mto: This revision was merged to the branch mainline in revision 116.
  • Revision ID: aaron@canonical.com-20131206212833-c3y8inm0fn50eu1z
Fix upgrade command.

Show diffs side-by-side

added added

removed removed

Lines of Context:
jujupy.py
184
184
        return self.client.bootstrap(self)
185
185
 
186
186
    def upgrade_juju(self):
187
 
        args = ('--version', str(self.get_matching_agent_version()))
 
187
        args = ('--version', self.get_matching_agent_version(no_build=True))
188
188
        if self.local:
189
189
            args += ('--upload-tools',)
190
190
        self.client.juju(self, 'upgrade-juju', args)
222
222
        else:
223
223
            raise Exception('Some versions did not update.')
224
224
 
225
 
    def get_matching_agent_version(self):
 
225
    def get_matching_agent_version(self, no_build=False):
226
226
        version_number = self.client.version.split('-')[0]
227
 
        if self.local:
 
227
        if not no_build and self.local:
228
228
            version_number += '.1'
229
229
        return version_number
230
230