[apt-proxy-devel] r642 - in trunk: apt_proxy debian

[Chris Halls]

Author: halls
Date: Wed Jan 24 13:33:43 2007
New Revision: 642

Modified:
   trunk/apt_proxy/fetchers.py
   trunk/debian/changelog
Log:
* Fix exception when sending ftp password to backend (Closes: #387243)
* Remove extra '/' in HTTP GET requests (Closes: #330492)


Modified: trunk/apt_proxy/fetchers.py
==============================================================================
--- trunk/apt_proxy/fetchers.py	(original)
+++ trunk/apt_proxy/fetchers.py	Wed Jan 24 13:33:43 2007
@@ -314,7 +314,7 @@
             serverpath = "http://" + backendServer.host
             if backendServer.port != 80:
                 serverpath = serverpath + ":" + str(backendServer.port)
-            serverpath = serverpath + "/" + backendServer.path 
+            serverpath = serverpath + backendServer.path
 
         get_path = serverpath + "/" + urllib.quote(uri)
         #self.sendCommand(self.request.method, 
@@ -546,8 +546,8 @@
         if not self.backendServer.username:
             creator = protocol.ClientCreator(reactor, ftp.FTPClient, passive=0)
         else:
-            creator = protocol.ClientCreator(reactor, ftp.FTPClient, request.backendServer.username,
-                                    request.backendServer.password, passive=0)
+            creator = protocol.ClientCreator(reactor, ftp.FTPClient, self.backendServer.username,
+                                    self.backendServer.password, passive=0)
         d = creator.connectTCP(self.backendServer.host, self.backendServer.port,
                                self.backendServer.backend.config.timeout)
         d.addCallback(self.controlConnectionMade)

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Wed Jan 24 13:33:43 2007
@@ -18,6 +18,8 @@
     (Closes: #393483, #366262)
   * Fix username at password given in backend server URLs and add a test case.
     Thanks Jason Thomas for the patch (Closes: #348985)
+  * Fix exception when sending ftp password to backend (Closes: #387243)
+  * Remove extra '/' in HTTP GET requests (Closes: #330492)
   * Uncompress Packages.gz and Packages.bz2 on the fly, and
     update databases from these files (Closes: #TODO)