rpms/gnome-packagekit/F-9 gnome-packagekit-gpg-bodge.patch, NONE, 1.1 gnome-packagekit.spec, 1.30, 1.31

[Todd Zullinger]

Greetings,

Richard Hughes wrote:
> gnome-packagekit-gpg-bodge.patch:
> 
> --- NEW FILE gnome-packagekit-gpg-bodge.patch ---
> diff --git a/src/gpk-application.c b/src/gpk-application.c
> index 559bfc4..320f569 100644
> --- a/src/gpk-application.c
> +++ b/src/gpk-application.c
...
> +	ret = pk_client_rollback (application->priv->client_action, key_package_id, &error);
> +	if (!ret) {
> +		pk_warning ("failed to install signature: %s", error->message);
> +		if (strcmp (error->message, "org.freedesktop.packagekit.install no") == 0) {
> +			gpk_application_error_message (application, _("You don't have the necessary privileges to install a signature"), NULL);
> +		} else if (g_str_has_prefix (error->message, "org.freedesktop.packagekit.install")) {
> +			/* canceled auth dialog, be silent */
> +		} else {
> +			/* ick, we failed so pretend we didn't do the action */
> +			gpk_application_error_message (application, _("The signature could not be installed"), error->message);
> +		}
> +		g_error_free (error);
> +	}

I know this is just a temporary hack (the GIGANTIC HACK wording in the
patch gave it away for me :), but can the wording here be changed to
be a little more accurate?  You don't "install" signatures.  What's
being installed (or perhaps imported, rather) is the repository's key.
Maybe something more like the following wording for the two strings
above:

pk_warning ("failed to import key: %s", error->message);
_("You don't have the necessary privileges to import a key")
_("The repository's key could not be imported")

I don't know what terminology pk uses to refer to repository's, so
that bit might be better worded.  But IMO the signature bit should be
changed, since it makes no sense to install a signature. :)

This doesn't seem to be in the upstream git anywhere yet, else I'd have
sent a more thorough patch to replace signature with key where it
seems appropriate.  Perhaps the anon-git server just hasn't been
synced yet today?

-- 
Todd        OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Damn you and your estrogenical treachery!
    -- Stewie Griffin

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 542 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-devel-list/attachments/20080430/37dfe1fb/attachment.sig>