[maemo-commits] [maemo-commits] r16345 - in projects/haf/trunk/apt-https: . debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-10-03 17:37:19 +0300 (Fri, 03 Oct 2008)
New Revision: 16345

Modified:
   projects/haf/trunk/apt-https/ChangeLog
   projects/haf/trunk/apt-https/debian/changelog
   projects/haf/trunk/apt-https/debian/control
   projects/haf/trunk/apt-https/maemo-mini-curl.c
Log:
apt-https (2.9) unstable; urgency=low

  * Conflict with apt-transport-https.

 -- Marius Vollmer <marius.vollmer at nokia.com>  Thu, 07 Feb 2008 14:33:52 +0200


Modified: projects/haf/trunk/apt-https/ChangeLog
===================================================================
--- projects/haf/trunk/apt-https/ChangeLog	2008-10-03 13:43:15 UTC (rev 16344)
+++ projects/haf/trunk/apt-https/ChangeLog	2008-10-03 14:37:19 UTC (rev 16345)
@@ -1,3 +1,7 @@
+2008-03-10  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* maemo-mini-curl.c (main): Call curl_easy_cleanup.
+
 2008-02-06  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 2.8

Modified: projects/haf/trunk/apt-https/debian/changelog
===================================================================
--- projects/haf/trunk/apt-https/debian/changelog	2008-10-03 13:43:15 UTC (rev 16344)
+++ projects/haf/trunk/apt-https/debian/changelog	2008-10-03 14:37:19 UTC (rev 16345)
@@ -1,6 +1,6 @@
-apt-https (2.9~unreleased) unstable; urgency=low
+apt-https (2.9) unstable; urgency=low
 
-  * 
+  * Conflict with apt-transport-https.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Thu, 07 Feb 2008 14:33:52 +0200
 

Modified: projects/haf/trunk/apt-https/debian/control
===================================================================
--- projects/haf/trunk/apt-https/debian/control	2008-10-03 13:43:15 UTC (rev 16344)
+++ projects/haf/trunk/apt-https/debian/control	2008-10-03 14:37:19 UTC (rev 16345)
@@ -8,6 +8,7 @@
 Package: apt-https
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: apt-transport-https
 Description: A HTTPS method for APT
  This package extends APT so that it can also retrieve files from
  HTTPS servers.

Modified: projects/haf/trunk/apt-https/maemo-mini-curl.c
===================================================================
--- projects/haf/trunk/apt-https/maemo-mini-curl.c	2008-10-03 13:43:15 UTC (rev 16344)
+++ projects/haf/trunk/apt-https/maemo-mini-curl.c	2008-10-03 14:37:19 UTC (rev 16345)
@@ -178,6 +178,12 @@
 int
 main (int argc, char **argv)
 {
+   if (argc < 4 || strcmp (argv[1], "-o"))
+     {
+       fprintf (stderr, "usage: maemo-mini-curl -o <dest> <url>\n");
+       exit (1);
+     }
+
    curl = curl_easy_init();
 
    if (curl == NULL)
@@ -186,14 +192,12 @@
        exit (1);
      }
 
-   if (argc < 4 || strcmp (argv[1], "-o"))
+   if (!fetch (argv[3], argv[2]))
      {
-       fprintf (stderr, "usage: maemo-mini-curl -o <dest> <url>\n");
+       curl_easy_cleanup (curl);
        exit (1);
      }
 
-   if (!fetch (argv[3], argv[2]))
-     exit (1);
-
+   curl_easy_cleanup (curl);
    exit (0);
 }