← Back to branch summary

~juju-qa/ubuntu/xenial/juju/2.0-rc2

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/juju/block/protection.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/cmd/juju/block/protection.go
4
4
package block
5
5
 
6
6
import (
7
 
        "github.com/juju/cmd"
 
7
        "github.com/juju/errors"
8
8
        "github.com/juju/loggo"
9
9
 
10
10
        "github.com/juju/juju/api"
91
91
                return nil
92
92
        }
93
93
        if params.IsCodeOperationBlocked(err) {
94
 
                logger.Errorf("%v\n%v", err, blockedMessages[block])
95
 
                return cmd.ErrSilent
 
94
                msg := blockedMessages[block]
 
95
                logger.Errorf("%v\n%v", err, msg)
 
96
                return errors.New(msg)
96
97
        }
97
98
        return err
98
99
}