[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.0.39.0-74-g0165289
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:16:45 CET 2014
The branch, release/0.4.0.x has been updated
via 016528916eeca1b895ccfa9e3543ad1eb05fb575 (commit)
from 40b6b7d3b3dea15cb21d0ee5a6deb4629dfed20e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2go/dropbox.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/x2go/dropbox.py b/x2go/dropbox.py
index 207c58b..1db958c 100644
--- a/x2go/dropbox.py
+++ b/x2go/dropbox.py
@@ -217,13 +217,15 @@ def x2go_dropboxjob_handler(dropbox_file=None,
logger('action for printing is: %s' % dropbox_action, loglevel=log.loglevel_DEBUG)
_blacklisted = dropbox_file.upper().split('.')[-1] in defaults.X2GO_DROPBOX_EXTENSIONS_BLACKLIST
- _really_process = bool(not _blacklisted and ((not dropbox_extensions) or [ ext for ext in dropbox_extensions if dropbox_file.upper().endswith('%s' % ext.upper())) ])
- if _really_process:
+ _really_process = bool(not _blacklisted and ((not dropbox_extensions) or [ ext for ext in dropbox_extensions if dropbox_file.upper().endswith('%s' % ext.upper()) ]))
+ if _really_process and not _blacklisted:
dropbox_action.do_process(dropbox_file=dropbox_file,
dropbox_dir=parent_thread.dropbox_dir,
)
+ elif not _blacklisted:
+ logger('file extension of dropbox file %s is prohibited by session profile configuration' % dropbox_file, loglevel=log.loglevel_NOTICE)
else:
- logger('file extension of dropbox file %s is prohibited by session profile configuration' % dropbox_file, loglevel=log.loglevel_WARN)
+ logger('file extension of dropbox file %s has been found in Python X2go\' hardcoded dropbox extenstions blacklist' % dropbox_file, loglevel=log.loglevel_WARN)
logger('removing dropbox file %s' % dropbox_file, loglevel=log.loglevel_DEBUG)
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).
More information about the x2go-commits
mailing list