[meego-commits] 15120: Changes to MeeGo:1.1:Core:Update:Testing/PackageKit

[Zhang Qiang]

Hi,
I have made the following changes to PackageKit in project MeeGo:1.1:Core:Update:Testing. Please review and accept ASAP.

Thank You,
Zhang Qiang

[This message was auto-generated]

---

Request #15120:

  submit:   home:xiaoqiang:branches:MeeGo:1.1:Core:Update:Testing/PackageKit(r2)(cleanup) -> MeeGo:1.1:Core:Update:Testing/PackageKit


Message:
    Add 0013-pk-console-support-subpercentage-for-pkcon.patch to report progress of Package Management task, fix BMC#14794;

State:   new          2011-03-23T00:12:12 xiaoqiang
Comment: None



changes files:
--------------
--- PackageKit.changes
+++ PackageKit.changes
@@ -0,0 +1,4 @@
+* Wed Mar 23 2011 Zhang Qiang<qiang.z.zhang at intel.com> - 0.6.7
+- Add 0013-pk-console-support-subpercentage-for-pkcon.patch to
+  report progress of Package Management task, fix BMC#14794
+

new:
----
  0013-pk-console-support-subpercentage-for-pkcon.patch

spec files:
-----------
--- PackageKit.spec
+++ PackageKit.spec
@@ -32,8 +32,9 @@
 Patch26:   pk-zypp-set-proxy-env.patch
 Patch27:   0001-Sent-correct-network-state-for-connman-end.patch
 Patch28:   meego-connman-conf.patch
-Patch29:   0019-remove-online-check-in-refresh.patch
-Patch30:   0020-fix-connman-Dbus-Name.patch
+Patch29:   0013-pk-console-support-subpercentage-for-pkcon.patch
+Patch30:   0019-remove-online-check-in-refresh.patch
+Patch31:   0020-fix-connman-Dbus-Name.patch
 
 Requires: PackageKit-gtk-module = %{version}-%{release}
 Requires: PackageKit-zypp = %{version}-%{release}
@@ -264,6 +265,7 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 %build
 MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2//' -e 's/-Wall//' -e 's/-Os//')

other changes:
--------------

++++++ 0013-pk-console-support-subpercentage-for-pkcon.patch (new)
--- 0013-pk-console-support-subpercentage-for-pkcon.patch
+++ 0013-pk-console-support-subpercentage-for-pkcon.patch
+From d7a7b5b7a132861efaf42e07383ddbf7b1c71bfa Mon Sep 17 00:00:00 2001
+From: Zhang Qiang <qiang.z.zhang at intel.com>
+Date: Wed, 22 Dec 2010 15:36:43 +0800
+Subject: [PATCH 13/13] pk console support subpercentage for pkcon
+
+---
+ client/pk-console.c |   18 ++++++++++++++++++
+ 1 files changed, 18 insertions(+), 0 deletions(-)
+
+diff --git a/client/pk-console.c b/client/pk-console.c
+index e21101b..df92289 100644
+--- a/client/pk-console.c
++++ b/client/pk-console.c
+@@ -576,6 +576,7 @@ static void
+ pk_console_progress_cb (PkProgress *progress, PkProgressType type, gpointer data)
+ {
+ 	gint percentage;
++	gint subpercentage;
+ 	PkStatusEnum status;
+ 	PkRoleEnum role;
+ 	const gchar *text;
+@@ -635,6 +636,23 @@ pk_console_progress_cb (PkProgress *progress, PkProgressType type, gpointer data
+ 		pk_progress_bar_set_percentage (progressbar, percentage);
+ 	}
+ 
++	/* subpercentage */
++	if (type == PK_PROGRESS_TYPE_SUBPERCENTAGE) {
++		g_object_get (progress,
++			      "subpercentage", &subpercentage,
++			      NULL);
++		if (!is_console) {
++			/* only print the 10's */
++			if (subpercentage % 10 != 0)
++				goto out;
++
++			/* TRANSLATORS: the subpercentage complete of the transaction */
++			g_print ("%s:\t%i\n", _("SubPercentage"), subpercentage);
++			goto out;
++		}
++		pk_progress_bar_set_percentage (progressbar, subpercentage);
++	}
++
+ 	/* status */
+ 	if (type == PK_PROGRESS_TYPE_STATUS) {
+ 		g_object_get (progress,
+-- 
+1.7.2.2
+