rpms/gnome-packagekit/F-9 gnome-packagekit-gpg-bodge.patch, 1.1, 1.2 gnome-packagekit.spec, 1.32, 1.33 sources, 1.17, 1.18
Richard Hughes (rhughes)
fedora-extras-commits at redhat.com
Wed Apr 30 17:02:19 UTC 2008
Author: rhughes
Update of /cvs/pkgs/rpms/gnome-packagekit/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26952
Modified Files:
gnome-packagekit-gpg-bodge.patch gnome-packagekit.spec sources
Log Message:
* Wed Apr 30 2008 Richard Hughes <rhughes at redhat.com> - 0.1.12-10.20080430
- Pull in the new snapshot from the stable GNOME_PACKAGEKIT_0_1_X branch.
- Fixes rh#442223, which is a release blocker.
gnome-packagekit-gpg-bodge.patch:
Index: gnome-packagekit-gpg-bodge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit-gpg-bodge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-packagekit-gpg-bodge.patch 30 Apr 2008 12:36:35 -0000 1.1
+++ gnome-packagekit-gpg-bodge.patch 30 Apr 2008 17:01:48 -0000 1.2
@@ -1,5 +1,5 @@
diff --git a/src/gpk-application.c b/src/gpk-application.c
-index 559bfc4..320f569 100644
+index d586d5a..8a28300 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -118,6 +118,10 @@ enum
@@ -13,8 +13,8 @@
static guint signals [LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (GpkApplication, gpk_application, G_TYPE_OBJECT)
-@@ -574,6 +578,39 @@ gpk_application_package_cb (PkClient *client, PkInfoEnum info, const gchar *pack
- g_free (text);
+@@ -577,6 +581,39 @@ gpk_application_package_cb (PkClient *client, PkInfoEnum info, const gchar *pack
+ gtk_main_iteration ();
}
+gboolean
@@ -53,7 +53,7 @@
/**
* gpk_application_error_code_cb:
**/
-@@ -587,6 +624,33 @@ gpk_application_error_code_cb (PkClient *client, PkErrorCodeEnum code, const gch
+@@ -590,6 +627,33 @@ gpk_application_error_code_cb (PkClient *client, PkErrorCodeEnum code, const gch
return;
}
@@ -87,7 +87,7 @@
gpk_application_error_message (application,
gpk_error_enum_to_localised_text (code), details);
}
-@@ -1964,6 +2028,20 @@ pk_application_repo_detail_cb (PkClient *client, const gchar *repo_id,
+@@ -1967,6 +2031,20 @@ pk_application_repo_detail_cb (PkClient *client, const gchar *repo_id,
}
/**
@@ -108,7 +108,7 @@
* gpk_application_init:
**/
static void
-@@ -2037,6 +2115,8 @@ gpk_application_init (GpkApplication *application)
+@@ -2040,6 +2118,8 @@ gpk_application_init (GpkApplication *application)
G_CALLBACK (gpk_application_allow_cancel_cb), application);
g_signal_connect (application->priv->client_action, "repo-detail",
G_CALLBACK (pk_application_repo_detail_cb), application);
@@ -117,6 +117,122 @@
application->priv->client_description = pk_client_new ();
g_signal_connect (application->priv->client_description, "description",
+diff --git a/src/gpk-install-file.c b/src/gpk-install-file.c
+index 578c70c..a5e1c35 100644
+--- a/src/gpk-install-file.c
++++ b/src/gpk-install-file.c
+@@ -34,6 +34,7 @@
+
+ #include <pk-debug.h>
+ #include <pk-client.h>
++#include <pk-package-id.h>
+
+ #include "gpk-progress.h"
+ #include "gpk-common.h"
+@@ -48,6 +49,10 @@ typedef enum {
+ PAGE_LAST
+ } PkPageEnum;
+
++static gchar *key_repository_name = NULL;
++static gchar *key_repo_id = NULL;
++static gchar *key_package_id = NULL;
++
+ static void
+ gpk_install_file_set_page (PkPageEnum page)
+ {
+@@ -150,6 +155,29 @@ gpk_install_file_status_changed_cb (PkClient *client,
+ }
+ }
+
++gboolean
++gpk_install_file_install_sig_cb (gpointer data)
++{
++ gboolean ret;
++ GError *error = NULL;
++
++ pk_debug ("install sig %s", key_package_id);
++ ret = pk_client_reset (client, &error);
++ if (!ret) {
++ pk_warning ("failed to reset client: %s", error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ // GIGANTIC HACK TO PRESERVE ABI
++ ret = pk_client_rollback (client, key_package_id, &error);
++ if (!ret) {
++ pk_warning ("failed to install signature: %s", error->message);
++ g_error_free (error);
++ }
++ return FALSE;
++}
++
+ static void
+ gpk_install_file_error_code_cb (PkClient *client,
+ PkErrorCodeEnum code,
+@@ -161,6 +189,32 @@ gpk_install_file_error_code_cb (PkClient *client,
+ gchar *title_bold;
+ gchar *details_safe;
+
++ // GIGANTIC HACK
++ if (code == PK_ERROR_ENUM_GPG_FAILURE) {
++ GtkWidget *main_window;
++ GtkWidget *dialog;
++ PkPackageId *ident;
++ main_window = glade_xml_get_widget (glade_xml, "window_updates");
++ ident = pk_package_id_new_from_string (key_package_id);
++ dialog = gtk_message_dialog_new (GTK_WINDOW (main_window), GTK_DIALOG_DESTROY_WITH_PARENT,
++ GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
++ "Do you want to import key %s from %s for %s?",
++ key_repo_id, key_repository_name, ident->name);
++ pk_package_id_free (ident);
++ gint result = gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++ if (result == GTK_RESPONSE_YES) {
++ dialog = gtk_message_dialog_new (GTK_WINDOW (main_window), GTK_DIALOG_DESTROY_WITH_PARENT,
++ GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK,
++ "Key will be imported, please try transaction again.\n"
++ "This UI will be replaced in future versions of PackageKit"
++ " - please don't file bugs as an update is being worked on...");
++ result = gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++ g_idle_add ((GSourceFunc) gpk_install_file_install_sig_cb, NULL);
++ return;
++ }
++ }
+ gpk_install_file_set_page (PAGE_ERROR);
+
+ /* set bold title */
+@@ -199,6 +253,20 @@ pk_button_close_cb (GtkWidget *widget, gpointer data)
+ }
+
+ /**
++ * pk_install_file_repo_signature_required_cb:
++ **/
++static void
++pk_install_file_repo_signature_required_cb (PkClient *client, const gchar *package_id, const gchar *repository_name,
++ const gchar *key_url, const gchar *key_userid, const gchar *key_id,
++ const gchar *key_fingerprint, const gchar *key_timestamp,
++ PkSigTypeEnum type, gpointer userdata)
++{
++ key_repository_name = g_strdup (repository_name);
++ key_repo_id = g_strdup (key_id);
++ key_package_id = g_strdup (package_id);
++}
++
++/**
+ * main:
+ **/
+ int
+@@ -272,6 +340,8 @@ main (int argc, char *argv[])
+ G_CALLBACK (gpk_install_file_status_changed_cb), NULL);
+ g_signal_connect (client, "error-code",
+ G_CALLBACK (gpk_install_file_error_code_cb), NULL);
++ g_signal_connect (client, "repo-signature-required",
++ G_CALLBACK (pk_install_file_repo_signature_required_cb), NULL);
+
+ glade_xml = glade_xml_new (PK_DATA "/gpk-install-file.glade", NULL, NULL);
+ main_window = glade_xml_get_widget (glade_xml, "window_updates");
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index e7d32f2..3ffec9a 100644
--- a/src/gpk-update-viewer.c
Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-packagekit.spec 30 Apr 2008 15:29:13 -0000 1.32
+++ gnome-packagekit.spec 30 Apr 2008 17:01:48 -0000 1.33
@@ -5,7 +5,7 @@
Summary: GNOME PackageKit Client
Name: gnome-packagekit
Version: 0.1.12
-Release: 9.%{?alphatag}%{?dist}
+Release: 10.%{?alphatag}%{?dist}
License: GPLv2+
Group: Applications/System
URL: http://www.packagekit.org
@@ -137,11 +137,15 @@
%{_datadir}/applications/gpk-*.desktop
%changelog
-* Sat Apr 30 2008 Richard Hughes <rhughes at redhat.com> - 0.1.12-9.20080430
+* Wed Apr 30 2008 Richard Hughes <rhughes at redhat.com> - 0.1.12-10.20080430
+- Pull in the new snapshot from the stable GNOME_PACKAGEKIT_0_1_X branch.
+- Fixes rh#442223, which is a release blocker.
+
+* Wed Apr 30 2008 Richard Hughes <rhughes at redhat.com> - 0.1.12-9.20080430
- Pull in the new snapshot from the stable GNOME_PACKAGEKIT_0_1_X branch.
- Fixes rh#441755, which is a release blocker.
-* Sat Apr 30 2008 Richard Hughes <rhughes at redhat.com> - 0.1.12-8.20080423
+* Wed Apr 30 2008 Richard Hughes <rhughes at redhat.com> - 0.1.12-8.20080423
- Bodge in some of the GPG import code from master in an attempt to be able to
install signatures for F9.
- Fixes rh#443445, which is a release blocker.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 30 Apr 2008 15:29:13 -0000 1.17
+++ sources 30 Apr 2008 17:01:48 -0000 1.18
@@ -1 +1 @@
-8962907bdcf50c7ccc1176b3d6b9e7e9 gnome-packagekit-0.1.12-20080430.tar.gz
+296d896ecbba574123cbf837f5623d31 gnome-packagekit-0.1.12-20080430.tar.gz
More information about the fedora-extras-commits
mailing list