r429 - in /apt-transport-debtorrent/trunk: connect.cc debian/changelog debian/control debian/source/ debian/source/format debtorrent.cc

[camrdale at users.alioth.debian.org]

Author: camrdale
Date: Fri Aug 27 06:14:14 2010
New Revision: 429

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=429
Log:
Update for ABI change in apt 0.8.0 (Closes: #594369, #452001)
(LP: #163891)

Added:
    apt-transport-debtorrent/trunk/debian/source/
    apt-transport-debtorrent/trunk/debian/source/format
Modified:
    apt-transport-debtorrent/trunk/connect.cc
    apt-transport-debtorrent/trunk/debian/changelog
    apt-transport-debtorrent/trunk/debian/control
    apt-transport-debtorrent/trunk/debtorrent.cc

Modified: apt-transport-debtorrent/trunk/connect.cc
URL: http://svn.debian.org/wsvn/debtorrent/apt-transport-debtorrent/trunk/connect.cc?rev=429&op=diff
==============================================================================
--- apt-transport-debtorrent/trunk/connect.cc (original)
+++ apt-transport-debtorrent/trunk/connect.cc Fri Aug 27 06:14:14 2010
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
+#include <sstream>
 
 // Internet stuff
 #include <netinet/in.h>
@@ -66,12 +67,10 @@
       wrong this will get tacked onto the end of the error message */
    if (LastHostAddr->ai_next != 0)
    {
-      char Name2[NI_MAXHOST + NI_MAXSERV + 10];
-      snprintf(Name2,sizeof(Name2),"[IP: %s %s]",Name,Service);
-      Owner->SetFailExtraMsg(string(Name2));
-   }   
-   else
-      Owner->SetFailExtraMsg("");
+      std::stringstream ss;
+      ioprintf(ss, "[IP: %s %s]",Name,Service);
+      Owner->SetIP(ss.str());
+   }
       
    // Get a socket
    if ((Fd = socket(Addr->ai_family,Addr->ai_socktype,
@@ -88,7 +87,7 @@
    /* This implements a timeout for connect by opening the connection
       nonblocking */
    if (WaitFd(Fd,true,TimeOut) == false) {
-      Owner->SetFailExtraMsg("\nFailReason: Timeout");
+      Owner->SetFailReason("Timeout");
       return _error->Error("Could not connect to %s:%s (%s), "
 			   "connection timed out",Host.c_str(),Service,Name);
    }
@@ -103,7 +102,7 @@
    {
       errno = Err;
       if(errno == ECONNREFUSED)
-         Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
+         Owner->SetFailReason("ConnectionRefused");
       return _error->Errno("connect","Could not connect to %s:%s (%s).",Host.c_str(),
 			   Service,Name);
    }
@@ -168,7 +167,7 @@
 	    
 	    if (Res == EAI_AGAIN)
 	    {
-	       Owner->SetFailExtraMsg("\nFailReason: TmpResolveFailure");
+	       Owner->SetFailReason("TmpResolveFailure");
 	       return _error->Error("Temporary failure resolving '%s'",
 				    Host.c_str());
 	    }

Modified: apt-transport-debtorrent/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debtorrent/apt-transport-debtorrent/trunk/debian/changelog?rev=429&op=diff
==============================================================================
--- apt-transport-debtorrent/trunk/debian/changelog (original)
+++ apt-transport-debtorrent/trunk/debian/changelog Fri Aug 27 06:14:14 2010
@@ -2,9 +2,10 @@
 
   * Fix some lintian warnings
     - Update standards version to 3.8.4 (no changes)
+  * Update for ABI change in apt 0.8.0 (Closes: #594369, #452001)
+    (LP: #163891)
 
-
- -- Cameron Dale <camrdale at gmail.com>  Sat, 20 Mar 2010 22:29:17 -0700
+ -- Cameron Dale <camrdale at gmail.com>  Thu, 26 Aug 2010 23:06:30 -0700
 
 apt-transport-debtorrent (0.2.1) unstable; urgency=low
 

Modified: apt-transport-debtorrent/trunk/debian/control
URL: http://svn.debian.org/wsvn/debtorrent/apt-transport-debtorrent/trunk/debian/control?rev=429&op=diff
==============================================================================
--- apt-transport-debtorrent/trunk/debian/control (original)
+++ apt-transport-debtorrent/trunk/debian/control Fri Aug 27 06:14:14 2010
@@ -13,7 +13,6 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: debtorrent (>= 0.1.7)
-Conflicts: debtorrent (<< 0.1.4)
 Description: an APT transport for communicating with DebTorrent
  This package contains the APT debtorrent transport. It makes it possible to
  use 'deb debtorrent://localhost:9988/foo distro main' type lines in your

Added: apt-transport-debtorrent/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debtorrent/apt-transport-debtorrent/trunk/debian/source/format?rev=429&op=file
==============================================================================
--- apt-transport-debtorrent/trunk/debian/source/format (added)
+++ apt-transport-debtorrent/trunk/debian/source/format Fri Aug 27 06:14:14 2010
@@ -1,0 +1,1 @@
+3.0 (native)

Modified: apt-transport-debtorrent/trunk/debtorrent.cc
URL: http://svn.debian.org/wsvn/debtorrent/apt-transport-debtorrent/trunk/debtorrent.cc?rev=429&op=diff
==============================================================================
--- apt-transport-debtorrent/trunk/debtorrent.cc (original)
+++ apt-transport-debtorrent/trunk/debtorrent.cc Fri Aug 27 06:14:14 2010
@@ -627,7 +627,7 @@
    
    if (stringcasecmp(Tag,"Last-Modified:") == 0)
    {
-      if (StrToTime(Val,Date) == false)
+      if (RFC1123StrToTime(Val.c_str(), Date) == false)
 	 return _error->Error("Unknown date format");
       return true;
    }