Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

mig/install/mig-user/.emacs

@@ -125,7 +125,7 @@
 ;       some migrid modules.
 (require 'py-autopep8)
 (add-hook 'python-mode-hook 'py-autopep8-enable-on-save)
-(setq py-autopep8-options '("--max-line-length=80 --ignore E402"))
+(setq py-autopep8-options '("--max-line-length=80" "--ignore=E402"))
 
 ;; Prefer espresso mode from  
 ;; http://download.savannah.gnu.org/releases-noredirect/espresso/espresso.el

mig/server/genoiddiscovery.py

@@ -107,7 +107,7 @@ def usage(name='genoiddiscovery.py'):
         print(generate_openid_discovery_doc(configuration))
         retval = 0
     except Exception as err:
-        print(err)
+        print(err, file=sys.stderr)
         sys.exit(1)
 
     sys.exit(retval)