[meego-commits] 9713: Changes to devel:packagemanagement/PackageKit
Zhang Qiang
no_reply at build.meego.com
Wed Nov 24 10:42:37 UTC 2010
Hi,
I have made the following changes to PackageKit in project devel:packagemanagement. Please review and accept ASAP.
Thank You,
Zhang Qiang
[This message was auto-generated]
---
Request #9713:
submit: home:xiaoqiang:branches:devel:packagemanagement/PackageKit(r17)(cleanup) -> devel:packagemanagement/PackageKit
Message:
Add pk-transaction-set-WAIT-while-in-queue.patch to set the staus of transaction as wait, and also emit to client. Add pk-zypp-use-ZYppFactoryException-to-catch-more-error.patch to use ZYppFactoryException to cache exception of zypper running. fix BMC#9532.
State: new 2010-11-24T02:42:37 xiaoqiang
Comment: None
changes files:
--------------
--- PackageKit.changes
+++ PackageKit.changes
@@ -0,0 +1,7 @@
+* Thu Nov 18 2010 Zhang Qiang<qiang.z.zhang at intel.com> - 0.6.7
+- Add pk-transaction-set-WAIT-while-in-queue.patch to set the
+ staus of transaction as wait, and also emit to client.
+- Add pk-zypp-use-ZYppFactoryException-to-catch-more-error.patch
+ to use ZYppFactoryException to cache exception of zypper running.
+ fix BMC#9532
+
new:
----
pk-transaction-set-WAIT-while-in-queue.patch
pk-zypp-use-ZYppFactoryException-to-catch-more-error.patch
spec files:
-----------
--- PackageKit.spec
+++ PackageKit.spec
@@ -15,9 +15,11 @@
Patch0: pk-meego-vendor.patch
Patch1: meego-preupgrade.patch
+#This two yum patches should be dropped
Patch2: pk-yum-ignore-log-format.patch
Patch6: pk-meego-policy.patch
Patch7: pk-yum-disable-preupgrade.patch
+#This patch has not been in upstream
Patch9: packagekit-shaddap.patch
Patch14: pk-zypp-patch-only.patch
Patch16: 0001-Transfer-the-correct-size-of-patch.patch
@@ -27,14 +29,18 @@
Patch20: pk-zypp-refresh_reload-rpmdb_disable-update-cache.patch
Patch21: pk-zypp-refresh-solv-pool-data.patch
Patch23: pk-zypp-add-no-space-support.patch
+#This patch has not been in upstream
Patch24: pk-transfer-pk-error-code.patch
Patch25: Add-transaction_start-and-transaction_stop.patch
Patch26: pk-zypp-set-proxy-env.patch
Patch27: 0001-Sent-correct-network-state-for-connman-end.patch
Patch28: 0001-zypp-Call-zypp_build_pool-when-searching-with-what_p.patch
+#This patch has not been in upstream
Patch29: pk-console-refresh-before-install.patch
Patch30: pk-zypp-use-filter-in-get-repolist.patch
Patch31: pk-zypp-check-if-the-update-is-already-installed.patch
+Patch32: pk-transaction-set-WAIT-while-in-queue.patch
+Patch33: pk-zypp-use-ZYppFactoryException-to-catch-more-error.patch
Requires: PackageKit-zypp = %{version}-%{release}
Requires: shared-mime-info
@@ -273,8 +279,19 @@
%patch29 -p1
%patch30 -p1
%patch31 -p1
+%patch32 -p1
+%patch33 -p1
%build
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2//' -e 's/-Wall//' -e 's/-Os//')
+export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
+
+MOZ_OPT_FLAGS=$(echo $CFLAGS| %{__sed} -e 's/-O2//' -e 's/-Wall//' -e 's/-Os//')
+export CFLAGS=$MOZ_OPT_FLAGS
+
+MOZ_OPT_FLAGS=$(echo $CXXFLAGS| %{__sed} -e 's/-O2//' -e 's/-Wall//' -e 's/-Os//')
+export CXXFLAGS=$MOZ_OPT_FLAGS
+
%configure \
--disable-static \
--enable-zypp \
other changes:
--------------
++++++ pk-transaction-set-WAIT-while-in-queue.patch (new)
--- pk-transaction-set-WAIT-while-in-queue.patch
+++ pk-transaction-set-WAIT-while-in-queue.patch
+diff -uNr PackageKit-0.6.7/src/pk-transaction.c PackageKit-0.6.7.new/src/pk-transaction.c
+--- PackageKit-0.6.7/src/pk-transaction.c 2010-11-17 18:06:27.908456723 +0800
++++ PackageKit-0.6.7.new/src/pk-transaction.c 2010-11-18 16:23:50.544580983 +0800
+@@ -382,7 +382,7 @@
+ /**
+ * pk_transaction_status_changed_emit:
+ **/
+-static void
++void
+ pk_transaction_status_changed_emit (PkTransaction *transaction, PkStatusEnum status)
+ {
+ g_return_if_fail (PK_IS_TRANSACTION (transaction));
+diff -uNr PackageKit-0.6.7/src/pk-transaction.h PackageKit-0.6.7.new/src/pk-transaction.h
+--- PackageKit-0.6.7/src/pk-transaction.h 2010-06-29 18:25:23.000000000 +0800
++++ PackageKit-0.6.7.new/src/pk-transaction.h 2010-11-18 16:25:47.588518478 +0800
+@@ -82,6 +82,11 @@
+ GType pk_transaction_get_type (void);
+ PkTransaction *pk_transaction_new (void);
+
++
++/* Status changed */
++void pk_transaction_status_changed_emit (PkTransaction *transaction,
++ PkStatusEnum status);
++
+ /* go go go! */
+ gboolean pk_transaction_run (PkTransaction *transaction)
+ G_GNUC_WARN_UNUSED_RESULT;
+diff -uNr PackageKit-0.6.7/src/pk-transaction-list.c PackageKit-0.6.7.new/src/pk-transaction-list.c
+--- PackageKit-0.6.7/src/pk-transaction-list.c 2010-06-29 18:25:23.000000000 +0800
++++ PackageKit-0.6.7.new/src/pk-transaction-list.c 2010-11-18 16:33:11.215618648 +0800
+@@ -43,6 +43,7 @@
+ #include "egg-string.h"
+
+ #include "pk-conf.h"
++#include "pk-transaction.h"
+ #include "pk-transaction-list.h"
+ #include "org.freedesktop.PackageKit.Transaction.h"
+
+@@ -614,6 +615,9 @@
+ if (pk_transaction_list_number_running (tlist) == 0) {
+ egg_debug ("running %s as no others in progress", item->tid);
+ pk_transaction_list_run_item (tlist, item);
++ } else {
++ /* emit status for GUIs */
++ pk_transaction_status_changed_emit (item->transaction, PK_STATUS_ENUM_WAIT);
+ }
+
+ return TRUE;
++++++ pk-zypp-use-ZYppFactoryException-to-catch-more-error.patch (new)
--- pk-zypp-use-ZYppFactoryException-to-catch-more-error.patch
+++ pk-zypp-use-ZYppFactoryException-to-catch-more-error.patch
+diff -uNr PackageKit-0.6.7/backends/zypp/pk-backend-zypp.cpp PackageKit-0.6.7.new/backends/zypp/pk-backend-zypp.cpp
+--- PackageKit-0.6.7/backends/zypp/pk-backend-zypp.cpp 2010-11-18 17:45:41.901393694 +0800
++++ PackageKit-0.6.7.new/backends/zypp/pk-backend-zypp.cpp 2010-11-24 14:36:53.737581270 +0800
+@@ -120,6 +120,13 @@
+ {
+ gchar **package_ids;
+ PkBitfield _filters = (PkBitfield) pk_backend_get_uint (backend, "filters");
++ zypp::ZYpp::Ptr zypp;
++
++ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+
+ package_ids = pk_backend_get_strv (backend, "package_ids");
+ if (!pk_package_ids_check (package_ids)) {
+@@ -288,6 +295,10 @@
+
+ zypp::ZYpp::Ptr zypp;
+ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+
+ egg_debug ("get_depends with filter '%s'", pk_filter_bitfield_to_string (_filters));
+
+@@ -445,6 +456,13 @@
+ backend_get_details_thread (PkBackend *backend)
+ {
+ gchar **package_ids;
++ zypp::ZYpp::Ptr zypp;
++
++ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+
+ package_ids = pk_backend_get_strv (backend, "package_ids");
+ if (!pk_package_ids_check (package_ids)) {
+@@ -552,6 +570,13 @@
+ static gboolean
+ backend_get_distro_upgrades_thread(PkBackend *backend)
+ {
++ zypp::ZYpp::Ptr zypp;
++
++ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+ pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
+
+ // refresh the repos before checking for updates
+@@ -645,6 +670,13 @@
+ backend_get_updates_thread (PkBackend *backend)
+ {
+ PkBitfield _filters = (PkBitfield) pk_backend_get_uint (backend, "filters");
++ zypp::ZYpp::Ptr zypp;
++
++ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+
+ typedef std::set<zypp::PoolItem>::iterator pi_it_t;
+
+@@ -717,6 +749,13 @@
+ backend_install_files_thread (PkBackend *backend)
+ {
+ gchar **full_paths;
++ zypp::ZYpp::Ptr zypp;
++
++ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+
+ full_paths = pk_backend_get_strv (backend, "full_paths");
+
+@@ -845,6 +884,13 @@
+ backend_get_update_detail_thread (PkBackend *backend)
+ {
+ gchar **package_ids;
++ zypp::ZYpp::Ptr zypp;
++
++ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+
+ package_ids = pk_backend_get_strv (backend, "package_ids");
+ if (package_ids == NULL) {
+@@ -935,6 +981,13 @@
+ static gboolean
+ backend_update_system_thread (PkBackend *backend)
+ {
++ zypp::ZYpp::Ptr zypp;
++
++ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+ pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
+ pk_backend_set_percentage (backend, 0);
+
+@@ -1001,6 +1054,10 @@
+
+ zypp::ZYpp::Ptr zypp;
+ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+
+ package_ids = pk_backend_get_strv (backend, "package_ids");
+ if (!pk_package_ids_check (package_ids)) {
+@@ -1166,6 +1223,10 @@
+ zypp::Target_Ptr target;
+ zypp::ZYpp::Ptr zypp;
+ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+
+ target = zypp->target ();
+
+@@ -1244,6 +1305,13 @@
+ {
+ gchar **package_ids = pk_backend_get_strv (backend, "package_ids");
+ PkBitfield _filters = (PkBitfield) pk_backend_get_uint (backend, "filters");
++ zypp::ZYpp::Ptr zypp;
++
++ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+
+ pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
+
+@@ -1320,7 +1388,13 @@
+ gchar **values;
+ const gchar *search;
+ guint mode;
+- //GList *list = NULL;
++ zypp::ZYpp::Ptr zypp;
++
++ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+
+ values = pk_backend_get_strv (backend, "search");
+ search = values[0]; //Fixme - support the possible multiple values (logical OR search)
+@@ -1402,6 +1476,13 @@
+ {
+ gchar **values;
+ const gchar *group;
++ zypp::ZYpp::Ptr zypp;
++
++ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return FALSE;
++ }
+
+ values = pk_backend_get_strv (backend, "search");
+ group = values[0]; //Fixme - add support for possible multiple values.
+@@ -1463,7 +1544,13 @@
+ static void
+ backend_get_repo_list (PkBackend *backend, PkBitfield filters)
+ {
+- //FIXME - use the new param - filter
++ zypp::ZYpp::Ptr zypp;
++
++ zypp = get_zypp (backend);
++ if (zypp == NULL){
++ pk_backend_finished (backend);
++ return;
++ }
+
+ pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
+
+@@ -1503,6 +1590,13 @@
+ static void
+ backend_repo_enable (PkBackend *backend, const gchar *rid, gboolean enabled)
+ {
++ zypp::ZYpp::Ptr zypp;
++
(104 more lines skipped)
More information about the MeeGo-commits
mailing list