projects
/
matthijs
/
projects
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: Add configuration infrastructure.
[matthijs/projects/backupninja.git]
/
src
/
backupninja
diff --git
a/src/backupninja
b/src/backupninja
index df7d3c5bd5441376399d3790313858daaa39da87..48330b3a6a28943e8167b4447aa844ff36141649 100755
(executable)
--- a/
src/backupninja
+++ b/
src/backupninja
@@
-27,6
+27,7
@@
import logging
import sys
from backupninja.log import setup_logging
import sys
from backupninja.log import setup_logging
+from backupninja import config
log = logging.getLogger()
log = logging.getLogger()
@@
-46,8
+47,15
@@
def main(argv):
setup_logging(options)
# Load config file
setup_logging(options)
# Load config file
+ global_conf = config.get_global_config(options)
+ if global_conf is None:
+ # Error was already logged
+ return 1
+
# Process command
parser.print_help()
# Process command
parser.print_help()
+ return 0
+
if __name__ == '__main__':
sys.exit(main(sys.argv))
if __name__ == '__main__':
sys.exit(main(sys.argv))