# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-12-17 18:13:47
# Node ID a3726eeb7227b0cdb6c42916fad34f4cea77474d
# Parent  3ff045a66cee113c42f39b0891f61dcf5af7b8a4

hooks: use safer method of exporting the RC_SCM_DATA, prevents JSON decode errors in case of None value

diff --git a/vcsserver/hooks.py b/vcsserver/hooks.py
--- a/vcsserver/hooks.py
+++ b/vcsserver/hooks.py
@@ -136,7 +136,10 @@ def _extras_from_ui(ui):
     hook_data = ui.config('rhodecode', 'RC_SCM_DATA')
     if not hook_data:
         # maybe it's inside environ ?
-        hook_data = os.environ.get('RC_SCM_DATA')
+        env_hook_data = os.environ.get('RC_SCM_DATA')
+        if env_hook_data:
+            hook_data = env_hook_data
+
     extras = json.loads(hook_data)
     return extras