[pkg-x2go-devel] Bug#780128: log.loglevel_WARNING is not defined
Mike Gabriel
mike.gabriel at das-netzwerkteam.de
Mon Mar 9 14:52:18 UTC 2015
Package: python-x2go
Severity: important
Version: 0.5.0.2-2
Tag: patch fixed-upstream
At various places in the code, the expression log.loglevel_WARNING is
used (which is not defined).
Correct expression: log.loglevel_WARN.
Upstream patch attached.
Mike
--
DAS-NETZWERKTEAM
mike gabriel, herweg 7, 24357 fleckeby
fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31
mail: mike.gabriel at das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
-------------- next part --------------
From: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu, 26 Feb 2015 09:17:55 +0000 (+0100)
Subject: No such constant loglevel_WARNING, must be logolevel_WARN.
X-Git-Url: http://code.x2go.org/gitweb?p=python-x2go.git;a=commitdiff_plain;h=db715ac943ac859edff198112055f0801f57843e
No such constant loglevel_WARNING, must be logolevel_WARN.
---
#diff --git a/debian/changelog b/debian/changelog
#index f83f094..f3fbe01 100644
#--- a/debian/changelog
#+++ b/debian/changelog
#@@ -1,7 +1,7 @@
# python-x2go (0.5.0.4-0x2go1) UNRELEASED; urgency=medium
#
# * New upstream version (0.5.0.4):
#- - Continue development...
#+ - No such constant loglevel_WARNING, must be logolevel_WARN.
#
# -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 26 Feb 2015 10:16:25 +0100
#
diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py
index 5df7c12..3039b97 100644
--- a/x2go/backends/control/plain.py
+++ b/x2go/backends/control/plain.py
@@ -1015,7 +1015,7 @@ class X2GoControlSession(paramiko.SSHClient):
look_for_keys=False)
except TypeError:
if _twofactorauth and password and passphrase and password != passphrase:
- self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_WARNING)
+ self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_WARN)
paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=pkey,
key_filename=key_filename, timeout=timeout, allow_agent=False,
look_for_keys=False)
@@ -1027,7 +1027,7 @@ class X2GoControlSession(paramiko.SSHClient):
look_for_keys=look_for_keys)
except TypeError:
if _twofactorauth and password and passphrase and password != passphrase:
- self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_WARNING)
+ self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_WARN)
paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=None,
key_filename=None, timeout=timeout, allow_agent=allow_agent,
look_for_keys=look_for_keys)
diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py
index d025c99..5aa2552 100644
--- a/x2go/backends/terminal/plain.py
+++ b/x2go/backends/terminal/plain.py
@@ -568,7 +568,7 @@ class X2GoTerminalSession(object):
###
### ARTSD AUDIO
###
- self.logger('the ArtsD sound server (as in KDE3) is obsolete and will not be supported by Python X2Go...', loglevel=log.loglevel_WARNING)
+ self.logger('the ArtsD sound server (as in KDE3) is obsolete and will not be supported by Python X2Go...', loglevel=log.loglevel_WARN)
elif self.params.snd_system == 'esd':
###
@@ -939,7 +939,7 @@ class X2GoTerminalSession(object):
self.logger('x2gomountdirs stdout is: %s' % _stdout, log.loglevel_NOTICE)
_stderr = stderr.read().split('\n')
if _stderr[0]:
- self.logger('x2gomountdirs stderr is: %s' % _stderr, log.loglevel_WARNING)
+ self.logger('x2gomountdirs stderr is: %s' % _stderr, log.loglevel_WARN)
except:
self._share_local_folder_lock.release()
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: Digitale PGP-Signatur
URL: <http://lists.alioth.debian.org/pipermail/pkg-x2go-devel/attachments/20150309/49060d34/attachment.sig>
More information about the Pkg-x2go-devel
mailing list