Skip to content

Commit

Permalink
#985: fixup r10642, an empty string would match everything
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@10657 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Sep 18, 2015
1 parent 13410eb commit c6812df
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/xpra/client/ui_client_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# later version. See the file COPYING for details.

import os
import re
import sys
import time
import datetime
Expand Down Expand Up @@ -71,7 +72,7 @@


#LOG_INFO_RESPONSE = ("^window.*position", "^window.*size$")
LOG_INFO_RESPONSE = os.environ.get("XPRA_LOG_INFO_RESPONSE", "").split(",")
LOG_INFO_RESPONSE = os.environ.get("XPRA_LOG_INFO_RESPONSE", "")


MIN_SCALING = float(os.environ.get("XPRA_MIN_SCALING", "0.1"))
Expand Down Expand Up @@ -1432,10 +1433,10 @@ def _process_info_response(self, packet):
self.info_request_pending = False
self.server_last_info = packet[1]
log("info-response: %s", self.server_last_info)
import re
logres = [re.compile(v) for v in LOG_INFO_RESPONSE]
if logres:
log.info("info-response debug for %s:", csv(["'%s'" % x for x in LOG_INFO_RESPONSE]))
if LOG_INFO_RESPONSE:
items = LOG_INFO_RESPONSE.split(",")
logres = [re.compile(v) for v in items]
log.info("info-response debug for %s:", csv(["'%s'" % x for x in items]))
for k in sorted(self.server_last_info.keys()):
if any(lr.match(k) for lr in logres):
log.info(" %s=%s", k, self.server_last_info[k])
Expand Down

0 comments on commit c6812df

Please sign in to comment.