Changeset 434
- Timestamp:
- 15/09/2007 15:39:02 (10 months ago)
- Files:
-
- packages/main/apt-mdx-method/tags/mercury/debian/changelog (modified) (1 diff)
- packages/main/apt-mdx-method/tags/mercury/mdx (modified) (4 diffs)
- packages/main/apt-mdx-method/trunk/debian/changelog (modified) (1 diff)
- packages/main/apt-mdx-method/trunk/mdx (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
packages/main/apt-mdx-method/tags/mercury/debian/changelog
r57 r434 1 apt-mdx-method (0.0.2.mercury-1) stable; urgency=low 2 3 * Work around for broken SSL support in pycurl with GnuTLS using wget 4 5 -- Unixmedia S.r.l. (Medianix Devel) <devel@unixmedia.it> Sat, 15 Sep 2007 15:37:50 +0200 6 1 7 apt-mdx-method (0.0.1.mercury-2) stable; urgency=low 2 8 packages/main/apt-mdx-method/tags/mercury/mdx
r42 r434 166 166 file = os.path.basename(self.uri) 167 167 self.size = int(d_d) 168 self.totsize = int(d_t) 168 169 try: 169 170 perc = (int(d_d)*100/int(d_t)) … … 190 191 c.setopt(c.SSL_VERIFYPEER, 0) 191 192 c.setopt(c.SSL_VERIFYHOST, 0) 193 #c.setopt(c.SSL_SESSIONID_CACHE, 0) 192 194 c.setopt(c.POST, 1) 193 195 c.setopt(c.POSTFIELDS, 'key='+urllib.quote(key)) … … 208 210 """ 209 211 except: 210 self.debug("INFO", "Getting file was stopped with HTTP code %s" % self.geterror) 211 self.addmsg("400 URI Failure") 212 self.addmsg("URI: %s" % uri) 213 self.addmsg("Message: stopped with HTTP code %s" % self.geterror) 212 if self.geterror: 213 self.debug("INFO", "Getting file was stopped with HTTP code %s" % self.geterror) 214 self.addmsg("400 URI Failure") 215 self.addmsg("URI: %s" % uri) 216 self.addmsg("Message: stopped with HTTP code %s" % self.geterror) 217 else: 218 self.debug("INFO", "Change method to wget") 219 self.debug("INFO", url) 220 try: 221 os.unlink(filename) 222 except: 223 pass 224 os.system("/usr/bin/wget --no-check-certificate --post-data='key=%s' -O %s %s" %(urllib.quote(key),filename,url)) 225 self.debug("INFO", "Getting file was cleany done") 226 self.addmsg("201 URI Done") 227 self.addmsg("URI: %s" % uri) 228 self.addmsg("Filename: %s" % filename) 229 try: 230 if self.totsize: 231 self.addmsg("Size: %d" % self.totsize) 232 except: 233 pass 214 234 try: 215 235 c.close() … … 229 249 env = "" 230 250 while(env != "\n"): 231 env = sys.__stdin__.readline().replace("\r", "") 251 try: 252 env = sys.__stdin__.readline().replace("\r", "") 253 except: 254 env = "\n" 232 255 if env != "\n": 233 command = env.split(" ", 1)[0] 256 try: 257 command = env.split(" ", 1)[0] 258 except: 259 command = "" 234 260 self.debug('ENV', env) 235 261 if command == "600": packages/main/apt-mdx-method/trunk/debian/changelog
r57 r434 1 apt-mdx-method (0.0.2-1) unstable; urgency=low 2 3 * Workaround for broken SSL support in pycurl with GnuTLS using wget 4 5 -- Unixmedia S.r.l. (Medianix Devel) <devel@unixmedia.it> Sat, 15 Sep 2007 15:36:45 +0200 6 1 7 apt-mdx-method (0.0.1-2) unstable; urgency=low 2 8 packages/main/apt-mdx-method/trunk/mdx
r42 r434 166 166 file = os.path.basename(self.uri) 167 167 self.size = int(d_d) 168 self.totsize = int(d_t) 168 169 try: 169 170 perc = (int(d_d)*100/int(d_t)) … … 190 191 c.setopt(c.SSL_VERIFYPEER, 0) 191 192 c.setopt(c.SSL_VERIFYHOST, 0) 193 #c.setopt(c.SSL_SESSIONID_CACHE, 0) 192 194 c.setopt(c.POST, 1) 193 195 c.setopt(c.POSTFIELDS, 'key='+urllib.quote(key)) … … 208 210 """ 209 211 except: 210 self.debug("INFO", "Getting file was stopped with HTTP code %s" % self.geterror) 211 self.addmsg("400 URI Failure") 212 self.addmsg("URI: %s" % uri) 213 self.addmsg("Message: stopped with HTTP code %s" % self.geterror) 212 if self.geterror: 213 self.debug("INFO", "Getting file was stopped with HTTP code %s" % self.geterror) 214 self.addmsg("400 URI Failure") 215 self.addmsg("URI: %s" % uri) 216 self.addmsg("Message: stopped with HTTP code %s" % self.geterror) 217 else: 218 self.debug("INFO", "Change method to wget") 219 self.debug("INFO", url) 220 try: 221 os.unlink(filename) 222 except: 223 pass 224 os.system("/usr/bin/wget --no-check-certificate --post-data='key=%s' -O %s %s" %(urllib.quote(key),filename,url)) 225 self.debug("INFO", "Getting file was cleany done") 226 self.addmsg("201 URI Done") 227 self.addmsg("URI: %s" % uri) 228 self.addmsg("Filename: %s" % filename) 229 try: 230 if self.totsize: 231 self.addmsg("Size: %d" % self.totsize) 232 except: 233 pass 214 234 try: 215 235 c.close() … … 229 249 env = "" 230 250 while(env != "\n"): 231 env = sys.__stdin__.readline().replace("\r", "") 251 try: 252 env = sys.__stdin__.readline().replace("\r", "") 253 except: 254 env = "\n" 232 255 if env != "\n": 233 command = env.split(" ", 1)[0] 256 try: 257 command = env.split(" ", 1)[0] 258 except: 259 command = "" 234 260 self.debug('ENV', env) 235 261 if command == "600":
