britney

Merge ~vorlon/britney/+git/britney2-ubuntu:options-not-mutually-exclusive into ~ubuntu-release/britney/+git/britney2-ubuntu:master

  1. Git
  2. lp:~vorlon/britney/+git/britney2-ubuntu
  3. options-not-mutually-exclusive
  4. Merge into master
Proposed by Steve Langasek
Status: Merged
Merged at revision: 4784a4c99b74d200f0e9fa280b26866b162e3fcb
Proposed branch: ~vorlon/britney/+git/britney2-ubuntu:options-not-mutually-exclusive
Merge into: ~ubuntu-release/britney/+git/britney2-ubuntu:master
Diff against target: 16 lines (+1/-4)
1 file modified
britney.py (+1/-4)
Reviewer Review Type Date Requested Status
Brian Murray Approve
Review via email: mp+409810@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/britney.py b/britney.py
2index 3f21937..b5deff2 100755
3--- a/britney.py
4+++ b/britney.py
5@@ -446,11 +446,8 @@ class Britney(object):
6 pass
7
8 # integrity checks
9- if self.options.nuninst_cache and self.options.print_uninst: # pragma: no cover
10- self.logger.error("nuninst_cache and print_uninst are mutually exclusive!")
11- sys.exit(1)
12 # if the configuration file exists, then read it and set the additional options
13- elif not os.path.isfile(self.options.config): # pragma: no cover
14+ if not os.path.isfile(self.options.config): # pragma: no cover
15 self.logger.error("Unable to read the configuration file (%s), exiting!", self.options.config)
16 sys.exit(1)
17

Subscribers

People subscribed via source and target branches