Commits

Byron Clark committed e76fea8

Cleanup logging.

Comments (0)

Files changed (2)

bin/udiskie-umount

     import sys
     import udiskie.umount
 
-    udiskie.umount.cli(sys.argv[1:])
+    sys.exit(udiskie.umount.cli(sys.argv[1:]))

udiskie/umount.py

             logger.debug('Skipping unhandled device %s' % (device,))
 
 def cli(args):
-    logging.basicConfig(level=logging.INFO)
     logger = logging.getLogger('udiskie.umount.cli')
     parser = optparse.OptionParser()
     parser.add_option('-a', '--all', action='store_true',
                       dest='all', default=False,
                       help='all devices')
+    parser.add_option('-v', '--verbose', action='store_true',
+                      dest='verbose', default=False,
+                      help='verbose output')
     (options, args) = parser.parse_args(args)
 
+    log_level = logging.INFO
+    if options.verbose:
+        log_level = logging.DEBUG
+    logging.basicConfig(level=log_level, format='%(message)s')
+
     if options.all:
         unmount_all()
     else:
-        print args
         if len(args) == 0:
             logger.warn('No devices provided for unmount')
+            return 1
 
         for path in args:
             unmount(path)