← Back to branch summary

~james-page/ubuntu/wily/juju-core/mir-fixes

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/cmd/juju/destroyenvironment.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-28 08:58:42 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20140328085842-cyzrgc120bdfxwj0
Tags: 1.17.7-0ubuntu1
https://launchpad.net/bugs/1294776
https://launchpad.net/bugs/1297077
* New upstream point release, including fixes for:
  - no debug log with all providers on Ubuntu 14.04 (LP: #1294776).
* d/control: Add cpu-checker dependency to juju-local (LP: #1297077).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/cmd/juju/destroyenvironment.go
54
54
        }
55
55
        environ, err := environs.NewFromName(c.envName, store)
56
56
        if err != nil {
 
57
                if environs.IsEmptyConfig(err) {
 
58
                        // Delete the .jenv file and call it done.
 
59
                        ctx.Infof("removing empty environment file")
 
60
                        return environs.DestroyInfo(c.envName, store)
 
61
                }
57
62
                return err
58
63
        }
59
64
        if !c.assumeYes {