[Python-apps-commits] r2092 - in packages/pyzor/trunk/debian/patches (1 file)

[tklauser-guest at users.alioth.debian.org]

    Date: Tuesday, December 23, 2008 @ 13:24:31
  Author: tklauser-guest
Revision: 2092

Update 09_check_discover_servers.dpatch so it cleanly applies after the previous patches

Modified:
  packages/pyzor/trunk/debian/patches/09_check_discover_servers.dpatch

Modified: packages/pyzor/trunk/debian/patches/09_check_discover_servers.dpatch
===================================================================
--- packages/pyzor/trunk/debian/patches/09_check_discover_servers.dpatch	2008-12-23 13:16:21 UTC (rev 2091)
+++ packages/pyzor/trunk/debian/patches/09_check_discover_servers.dpatch	2008-12-23 13:24:31 UTC (rev 2092)
@@ -1,32 +1,33 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_check_discover_servers.dpatch by Tobias Klauser <tklauser at access.unizh.ch>
+## 09_check_discover_servers.dpatch by Tobias Klauser <tklauser at distanz.ch>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Check whether the discovered servers really look like server adresses and
 ## DP: print an error messages when no valid servers are found (Fixes #494047).
 
 @DPATCH@
-diff -urpN pyzor-0.4.0+cvs20030201.orig/lib/pyzor/client.py pyzor-0.4.0+cvs20030201/lib/pyzor/client.py
---- pyzor-0.4.0+cvs20030201.orig/lib/pyzor/client.py	2003-02-01 11:29:42.000000000 +0100
-+++ pyzor-0.4.0+cvs20030201/lib/pyzor/client.py	2008-10-26 18:45:33.000000000 +0100
+diff -urpN pyzor-0.4.0+cvs20030201~/lib/pyzor/client.py pyzor-0.4.0+cvs20030201/lib/pyzor/client.py
+--- pyzor-0.4.0+cvs20030201~/lib/pyzor/client.py	2008-12-23 14:19:14.000000000 +0100
++++ pyzor-0.4.0+cvs20030201/lib/pyzor/client.py	2008-12-23 14:22:02.000000000 +0100
 @@ -10,6 +10,7 @@ import mimetools
  import multifile
  import sha
- import threading
+ import signal
 +import re
  
  import pyzor
  from pyzor import *
-@@ -113,7 +114,7 @@ class ServerList(list):
+@@ -113,7 +114,8 @@ class ServerList(list):
          for line in serverfile:
              orig_line = line
              line = line.strip()
 -            if line and not line.startswith('#'):
++            # Needs to be a valid host:port combination
 +            if line and not line.startswith('#') and re.match('[a-zA-Z0-9.-]+:[0-9]+', line):
                  self.append(pyzor.Address.from_str(line))
  
  
-@@ -172,6 +173,12 @@ class ExecCall(object):
+@@ -182,6 +184,12 @@ class ExecCall(object):
  
  
          self.servers  = self.get_servers(servers_fn)