socsvn commit: r253472 - in soc2013/mattbw/backend: . actions

[mattbw at FreeBSD.org]

Author: mattbw
Date: Tue Jun 25 03:54:59 2013
New Revision: 253472
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253472

Log:
  restructuring; also fix bug with get-details reporting same package information for different packageIDs

Added:
  soc2013/mattbw/backend/actions/
  soc2013/mattbw/backend/actions/get-details.c
     - copied, changed from r253467, soc2013/mattbw/backend/get-details.c
  soc2013/mattbw/backend/actions/get-details.h
     - copied, changed from r253439, soc2013/mattbw/backend/get-details.h
Deleted:
  soc2013/mattbw/backend/get-details.c
  soc2013/mattbw/backend/get-details.h
  soc2013/mattbw/backend/get_details.h
Modified:
  soc2013/mattbw/backend/Makefile
  soc2013/mattbw/backend/pk-backend-pkgng.c

Modified: soc2013/mattbw/backend/Makefile
==============================================================================
--- soc2013/mattbw/backend/Makefile	Tue Jun 25 02:48:36 2013	(r253471)
+++ soc2013/mattbw/backend/Makefile	Tue Jun 25 03:54:59 2013	(r253472)
@@ -2,7 +2,8 @@
 
 LIB=		pk_backend_pkgng
 SHLIB_MAJOR=	1
-SRCS=		pk-backend-pkgng.c get-details.c groups.c db.c licenses.c
+SRCS=		pk-backend-pkgng.c groups.c db.c licenses.c
+SRCS+=		actions/get-details.c
 
 LIBDIR=		/usr/local/lib/packagekit-backend
 

Copied and modified: soc2013/mattbw/backend/actions/get-details.c (from r253467, soc2013/mattbw/backend/get-details.c)
==============================================================================
--- soc2013/mattbw/backend/get-details.c	Tue Jun 25 01:20:35 2013	(r253467, copy source)
+++ soc2013/mattbw/backend/actions/get-details.c	Tue Jun 25 03:54:59 2013	(r253472)
@@ -21,13 +21,14 @@
 #include <string.h>
 
 #include <glib.h>
-#include "pk-backend.h"
+#include "../pk-backend.h"
 #include "pkg.h"
 
-#include "db.h"			/* open_remote_db */
+#include "../db.h"		/* open_remote_db */
+#include "../groups.h"		/* group_from_origin */
+#include "../licenses.h"	/* license_from_pkg */
+
 #include "get-details.h"	/* get_details_thread prototype */
-#include "groups.h"		/* group_from_origin */
-#include "licenses.h"		/* license_from_pkg */
 
 static const int LOAD_FLAGS = PKG_LOAD_BASIC | PKG_LOAD_LICENSES;
 
@@ -293,7 +294,7 @@
 
 	pk_backend_set_percentage(backend, 0);
 	for (i = 0; i < len && no_error_yet; i++) {
-		no_error_yet = get_details_for(package_ids[0], backend, db);
+		no_error_yet = get_details_for(package_ids[i], backend, db);
 		pk_backend_set_percentage(backend, ((i * 100) / len));
 	}
 	pkgdb_close(db);

Copied and modified: soc2013/mattbw/backend/actions/get-details.h (from r253439, soc2013/mattbw/backend/get-details.h)
==============================================================================
--- soc2013/mattbw/backend/get-details.h	Mon Jun 24 19:45:46 2013	(r253439, copy source)
+++ soc2013/mattbw/backend/actions/get-details.h	Tue Jun 25 03:54:59 2013	(r253472)
@@ -22,7 +22,7 @@
 #define _PKGNG_BACKEND_GET_DETAILS_H_
 
 #include <glib.h>		/* gboolean */
-#include "pk-backend.h"		/* PkBackend */
+#include "../pk-backend.h"	/* PkBackend */
 
 gboolean	get_details_thread(PkBackend *backend);
 

Modified: soc2013/mattbw/backend/pk-backend-pkgng.c
==============================================================================
--- soc2013/mattbw/backend/pk-backend-pkgng.c	Tue Jun 25 02:48:36 2013	(r253471)
+++ soc2013/mattbw/backend/pk-backend-pkgng.c	Tue Jun 25 03:54:59 2013	(r253472)
@@ -30,8 +30,8 @@
 #include "pk-backend.h"
 #include "pkg.h"
 
-#include "groups.h" /* available_groups */
-#include "get-details.h" /* get_details_thread */
+#include "groups.h"		/* available_groups */
+#include "actions/get-details.h"/* get_details_thread */
 
 #define INTENTIONALLY_IGNORE(x)	(void)(x)
 
@@ -88,7 +88,7 @@
 
 /*
  * Return all groups available from this backend.
- *
+ * 
  * The business end of this function is in "groups.c".
  */
 PkBitfield
@@ -186,7 +186,8 @@
 void
 pk_backend_get_details(PkBackend *backend, gchar **package_ids)
 {
-	INTENTIONALLY_IGNORE(package_ids);	/* can be retrieved from backend */
+	INTENTIONALLY_IGNORE(package_ids);	/* can be retrieved from
+						 * backend */
 
 	pk_backend_set_status(backend, PK_STATUS_ENUM_QUERY);
 	pk_backend_set_percentage(backend, PK_BACKEND_PERCENTAGE_INVALID);