summaryrefslogtreecommitdiff
path: root/morphlib/app.py
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-03-20 16:14:24 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-03-20 16:15:01 +0000
commit93f905a469228638a890aa4c2a3b1c895bbd400b (patch)
treefb0c99ca07e3e3bf5e6e411b74b4af874af207dc /morphlib/app.py
parentd9a0895320cf6ab948346afb6b58108d29667fa2 (diff)
downloadmorph-93f905a469228638a890aa4c2a3b1c895bbd400b.tar.gz
Fix condition for showing the staging-filler warning
If there is no staging-filler setting in a configuration file, it defaults to the empty string, not None. Reviewed-by: Jonathan Maw over the shoulder
Diffstat (limited to 'morphlib/app.py')
-rwxr-xr-xmorphlib/app.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/app.py b/morphlib/app.py
index ac36353e..859019f9 100755
--- a/morphlib/app.py
+++ b/morphlib/app.py
@@ -161,7 +161,7 @@ class Morph(cliapp.Application):
raise cliapp.AppException(
'The "staging-chroot" option has been set to False. This '
'option is obsolete and should be left as the default (True).')
- if self.settings['staging-filler'] is not None:
+ if self.settings['staging-filler']:
self.status(msg='WARNING! A staging filler was specified. Staging '
'fillers are deprecated and may break new builds. You '
'should only specify this option if you are building '