socsvn commit: r253750 - soc2013/mattbw/backend

[mattbw at FreeBSD.org]

Author: mattbw
Date: Sun Jun 30 22:35:37 2013
New Revision: 253750
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253750

Log:
  remove some dead-end bits of dummy code

Modified:
  soc2013/mattbw/backend/pk-backend-pkgng.c

Modified: soc2013/mattbw/backend/pk-backend-pkgng.c
==============================================================================
--- soc2013/mattbw/backend/pk-backend-pkgng.c	Sun Jun 30 21:06:47 2013	(r253749)
+++ soc2013/mattbw/backend/pk-backend-pkgng.c	Sun Jun 30 22:35:37 2013	(r253750)
@@ -43,15 +43,10 @@
 static gchar  **_package_ids;
 static gchar  **_values;
 static guint	_package_current = 0;
-static gboolean	_repo_enabled_local = FALSE;
-static gboolean	_repo_enabled_fedora = TRUE;
-static gboolean	_repo_enabled_devel = TRUE;
-static gboolean	_repo_enabled_livna = TRUE;
 static gboolean	_updated_gtkhtml = FALSE;
 static gboolean	_updated_kernel = FALSE;
 static gboolean	_updated_powertop = FALSE;
 static gboolean	_has_signature = FALSE;
-static gboolean	_use_blocked = FALSE;
 static gboolean	_use_eula = FALSE;
 static gboolean	_use_media = FALSE;
 static gboolean	_use_gpg = FALSE;
@@ -355,13 +350,6 @@
 {
 	PkBackend      *backend = (PkBackend *)data;
 
-	if (_use_blocked) {
-		if (!_updated_powertop && !_updated_kernel && !_updated_gtkhtml) {
-			pk_backend_package(backend, PK_INFO_ENUM_BLOCKED,
-					   "vino;2.24.2.fc9;i386;fedora",
-				   "Remote desktop server for the desktop");
-		}
-	}
 	if (!_updated_powertop) {
 		pk_backend_package(backend, PK_INFO_ENUM_NORMAL,
 				   "powertop;1.8-1.fc8;i386;fedora",
@@ -828,12 +816,6 @@
 	guint		sub;
 
 	if (_progress_percentage == 100) {
-		if (_use_blocked) {
-			pk_backend_package(backend, PK_INFO_ENUM_BLOCKED,
-					"gtkhtml2;2.19.1-4.fc8;i386;fedora",
-					   "An HTML widget for GTK+ 2.0");
-			_updated_gtkhtml = FALSE;
-		}
 		pk_backend_finished(backend);
 		return FALSE;
 	}
@@ -858,12 +840,10 @@
 		pk_backend_message(backend, PK_MESSAGE_ENUM_BROKEN_MIRROR, "fedora-updates-testing-debuginfo metadata is invalid");
 		pk_backend_message(backend, PK_MESSAGE_ENUM_BROKEN_MIRROR, "fedora-updates-testing-source metadata is invalid");
 		pk_backend_set_sub_percentage(backend, 100);
-		if (!_use_blocked) {
-			pk_backend_package(backend, PK_INFO_ENUM_INSTALLING,
+		pk_backend_package(backend, PK_INFO_ENUM_INSTALLING,
 					"gtkhtml2;2.19.1-4.fc8;i386;fedora",
 					   "An HTML widget for GTK+ 2.0");
-			_updated_gtkhtml = TRUE;
-		}
+		_updated_gtkhtml = TRUE;
 		pk_backend_set_sub_percentage(backend, 0);
 	}
 	if (_progress_percentage == 40 && !_updated_powertop) {
@@ -992,17 +972,10 @@
 		pk_backend_message(backend, PK_MESSAGE_ENUM_BROKEN_MIRROR, "fedora-updates-testing metadata is invalid");
 		pk_backend_message(backend, PK_MESSAGE_ENUM_BROKEN_MIRROR, "fedora-updates-testing-debuginfo metadata is invalid");
 		pk_backend_message(backend, PK_MESSAGE_ENUM_BROKEN_MIRROR, "fedora-updates-testing-source metadata is invalid");
-		if (_use_blocked) {
-			pk_backend_package(backend, PK_INFO_ENUM_BLOCKED,
-					"gtkhtml2;2.19.1-4.fc8;i386;fedora",
-					   "An HTML widget for GTK+ 2.0");
-			_updated_gtkhtml = FALSE;
-		} else {
-			pk_backend_package(backend, PK_INFO_ENUM_INSTALLING,
+		pk_backend_package(backend, PK_INFO_ENUM_INSTALLING,
 					"gtkhtml2;2.19.1-4.fc8;i386;fedora",
 					   "An HTML widget for GTK+ 2.0");
-			_updated_gtkhtml = TRUE;
-		}
+		_updated_gtkhtml = TRUE;
 	}
 	if (_progress_percentage == 40 && !_updated_powertop) {
 		pk_backend_set_status(backend, PK_STATUS_ENUM_UPDATE);
@@ -1186,57 +1159,11 @@
 	pk_backend_finished(backend);
 }
 
-/**
- * pk_backend_repo_enable:
- */
-void
-pk_backend_repo_enable(PkBackend *backend, const gchar *rid, gboolean enabled)
-{
-	pk_backend_set_status(backend, PK_STATUS_ENUM_REQUEST);
-
-	if (g_strcmp0(rid, "local") == 0) {
-		g_debug("local repo: %i", enabled);
-		_repo_enabled_local = enabled;
-	} else if (g_strcmp0(rid, "development") == 0) {
-		g_debug("devel repo: %i", enabled);
-		_repo_enabled_devel = enabled;
-	} else if (g_strcmp0(rid, "fedora") == 0) {
-		g_debug("fedora repo: %i", enabled);
-		_repo_enabled_fedora = enabled;
-	} else if (g_strcmp0(rid, "livna-development") == 0) {
-		g_debug("livna repo: %i", enabled);
-		_repo_enabled_livna = enabled;
-	} else {
-		g_warning("unknown repo: %s", rid);
-	}
-	pk_backend_finished(backend);
-}
-
-/**
- * pk_backend_repo_set_data:
+/*
+ * Not supported:
+ * - pk_backend_repo_enable
+ * - pk_backend_repo_set_data
  */
-void
-pk_backend_repo_set_data(PkBackend *backend, const gchar *rid, const gchar *parameter, const gchar *value)
-{
-	pk_backend_set_status(backend, PK_STATUS_ENUM_REQUEST);
-	g_warning("REPO '%s' PARAMETER '%s' TO '%s'", rid, parameter, value);
-
-	if (g_strcmp0(parameter, "use-blocked") == 0)
-		_use_blocked = atoi(value);
-	else if (g_strcmp0(parameter, "use-eula") == 0)
-		_use_eula = atoi(value);
-	else if (g_strcmp0(parameter, "use-media") == 0)
-		_use_media = atoi(value);
-	else if (g_strcmp0(parameter, "use-gpg") == 0)
-		_use_gpg = atoi(value);
-	else if (g_strcmp0(parameter, "use-trusted") == 0)
-		_use_trusted = atoi(value);
-	else if (g_strcmp0(parameter, "use-distro-upgrade") == 0)
-		_use_distro_upgrade = atoi(value);
-	else
-		pk_backend_message(backend, PK_MESSAGE_ENUM_PARAMETER_INVALID, "invalid parameter %s", parameter);
-	pk_backend_finished(backend);
-}
 
 /**
  * pk_backend_what_provides_timeout: