Mailinglist Archive: opensuse-commit (4019 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package PackageKit for 
openSUSE:12.1:Update:Test checked in at 2011-12-02 16:58:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/PackageKit (Old)
 and      /work/SRC/openSUSE:12.1:Update:Test/.PackageKit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "PackageKit", Maintainer is "gnome-maintainers@xxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:12.1:Update:Test/PackageKit/PackageKit.changes   
2011-11-24 20:14:28.000000000 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.PackageKit.new/PackageKit.changes      
2011-12-02 17:06:28.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 10 21:46:58 UTC 2011 - wstephenson@xxxxxxxx
+
+- Set the correct role on AcceptEula transactions so clients can
+  reschedule the installation after accepting the EULA (bnc#729892)
+
+-------------------------------------------------------------------

New:
----
  7578d611-set-accept-eula-role.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ PackageKit.spec ++++++
--- /var/tmp/diff_new_pack.865hFr/_old  2011-12-02 17:06:28.000000000 +0100
+++ /var/tmp/diff_new_pack.865hFr/_new  2011-12-02 17:06:28.000000000 +0100
@@ -93,6 +93,8 @@
 Patch3:         0004-Workaround-Don-t-refresh-repositories-each-time-for-.patch
 # PATCH-FIX-UPSTREAM PackageKit-npapi.patch fdo#40026 wr@xxxxxxxxxxxxx -- 
Build against npapi-sdk instead of xulrunner
 Patch4:         0005-Build-against-npapi-sdk-instead-of-xulrunner.patch
+# PATCH-FIX-UPSTREAM 
+Patch5:         7578d611-set-accept-eula-role.diff
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       %{name}-branding = %{version}
@@ -310,7 +312,7 @@
 suck less.
 
 This package provides the upstream default configuration for PackageKit.
-
+#
 %lang_package
 %prep
 %setup -q
@@ -322,6 +324,7 @@
 %if 0%{suse_version} > 1140
 %patch4 -p1
 %endif
+%patch5 -p1
 # Remove .moc files, as they make the build fail with our qt. They will be 
re-created during the build. See fdo#40662.
 rm lib/packagekit-qt/src/*.moc lib/packagekit-qt2/*.moc
 

++++++ 7578d611-set-accept-eula-role.diff ++++++
> From 7578d6111c0b27a4760b1099e0647deb7e2cfe16 Mon Sep 17 00:00:00 2001
From: Daniel Nicoletti <dantti85-pk@xxxxxxxxxxxx>
Date: Wed, 9 Nov 2011 17:11:27 -0200
Subject: [PATCH] packagekit: Set the right role on accept-eula

---
 src/pk-backend.c     |    1 +
 src/pk-transaction.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/pk-backend.c b/src/pk-backend.c
index 47c87d1..5629d33 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -2652,6 +2652,7 @@ pk_backend_accept_eula (PkBackend *backend, const gchar 
*eula_id)
 
        g_return_val_if_fail (PK_IS_BACKEND (backend), FALSE);
        g_return_val_if_fail (eula_id != NULL, FALSE);
+       pk_backend_set_role_internal (backend, PK_ROLE_ENUM_ACCEPT_EULA);
 
        g_debug ("eula_id %s", eula_id);
        present = g_hash_table_lookup (backend->priv->eulas, eula_id);
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index 77b6fd6..cfa935e 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -2763,6 +2763,7 @@ pk_transaction_accept_eula (PkTransaction *transaction, 
const gchar *eula_id, DB
 
        g_return_if_fail (PK_IS_TRANSACTION (transaction));
        g_return_if_fail (transaction->priv->tid != NULL);
+       pk_transaction_set_role (transaction, PK_ROLE_ENUM_ACCEPT_EULA);
 
        /* check if the sender is the same */
        ret = pk_transaction_verify_sender (transaction, context, &error);
-- 
1.6.1


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx