Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2013-01-22 17:40:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2013-01-20 08:23:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2013-01-22 17:40:27.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Jan 21 12:34:16 UTC 2013 - co...@suse.com + +- Add two more patches fixing things from git: + + 0007-fix-crash-while-calling-inhibit-into-systemd-login.patch + + 0008-zypp-ignore-System-upgrades-during-update.patch + +------------------------------------------------------------------- +Sun Jan 20 20:45:13 UTC 2013 - co...@suse.com + +- Add 0006-zypp-do-not-trigger-invalid-numbers.patch to avoid crash + during download. + +------------------------------------------------------------------- New: ---- 0006-zypp-do-not-trigger-invalid-numbers.patch 0007-fix-crash-while-calling-inhibit-into-systemd-login.patch 0008-zypp-ignore-System-upgrades-during-update.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.RLQWS0/_old 2013-01-22 17:40:28.000000000 +0100 +++ /var/tmp/diff_new_pack.RLQWS0/_new 2013-01-22 17:40:28.000000000 +0100 @@ -40,6 +40,12 @@ Patch5: 0004-zypp-use-the-right-functions-to-get-solvables.patch # PATCH-FIX-UPSTREAM 0005-zypp-use-the-right-functions-to-get-solvables.patch co...@suse.de -- fix removing Patch6: 0005-zypp-fix-removing-packages.patch +# PATCH-FIX-UPSTREAM 0006-zypp-do-not-trigger-invalid-numbers.patch co...@suse.de -- fix crash +Patch7: 0006-zypp-do-not-trigger-invalid-numbers.patch +# PATCH-FIX-UPSTREAM 0007-fix-crash-while-calling-inhibit-into-systemd-login.patch co...@suse.de -- fix another crash +Patch8: 0007-fix-crash-while-calling-inhibit-into-systemd-login.patch +# PATCH-FIX-UPSTREAM 0008-zypp-ignore-System-upgrades-during-update.patch co...@suse.de -- avoid useless confirmations +Patch9: 0008-zypp-ignore-System-upgrades-during-update.patch # To update this package, please git-format-patch the tag of the # tarball version (eg: PACKAGEKIT_0_6_19) vs the distro tag (eg: openSUSE_Factory) # in https://github.com/openSUSE/PackageKit and keep the patches @@ -264,6 +270,9 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 translation-update-upstream %build ++++++ 0006-zypp-do-not-trigger-invalid-numbers.patch ++++++ >From 75b28d5c9b98946d275368708388ce6c13e05471 Mon Sep 17 00:00:00 2001 From: Stephan Kulow <co...@suse.de> Date: Sun, 20 Jan 2013 15:32:55 +0100 Subject: [PATCH 8/8] zypp: do not trigger invalid numbers (and revert accident commit outside of zypp backend) --- backends/zypp/zypp-events.h | 1 + src/pk-backend-job.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backends/zypp/zypp-events.h b/backends/zypp/zypp-events.h index 69777ec..623ec77 100644 --- a/backends/zypp/zypp-events.h +++ b/backends/zypp/zypp-events.h @@ -95,6 +95,7 @@ public: if (percentage > 100) { MIL << "libzypp is silly" << std::endl; + return; } _sub_percentage = percentage; diff --git a/src/pk-backend-job.c b/src/pk-backend-job.c index d1d7035..45e992a 100644 --- a/src/pk-backend-job.c +++ b/src/pk-backend-job.c @@ -987,7 +987,7 @@ pk_backend_job_set_item_progress (PkBackendJob *job, /* invalid number? */ if (percentage > 100 && percentage != PK_BACKEND_PERCENTAGE_INVALID) { - g_error ("invalid number %i", percentage); + g_debug ("invalid number %i", percentage); return; } -- 1.8.1.1 ++++++ 0007-fix-crash-while-calling-inhibit-into-systemd-login.patch ++++++ >From 8929180f3564a23fe6abc93662e7244db2e03d13 Mon Sep 17 00:00:00 2001 From: Stephan Kulow <co...@suse.de> Date: Mon, 21 Jan 2013 12:03:52 +0100 Subject: [PATCH 1/2] fix crash while calling inhibit into systemd-login --- src/pk-engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pk-engine.c b/src/pk-engine.c index facc5f9..df45c63 100644 --- a/src/pk-engine.c +++ b/src/pk-engine.c @@ -265,7 +265,7 @@ pk_engine_inhibit (PkEngine *engine) /* block shutdown and idle */ res = g_dbus_proxy_call_sync (engine->priv->logind_proxy, "Inhibit", - g_variant_new ("ssss", + g_variant_new ("(ssss)", "shutdown:idle", "Package Updater", "Package Update in Progress", -- 1.8.1.1 ++++++ 0008-zypp-ignore-System-upgrades-during-update.patch ++++++ >From 355bcea3b87bac8000a710285b90daae322b6648 Mon Sep 17 00:00:00 2001 From: Stephan Kulow <co...@suse.de> Date: Mon, 21 Jan 2013 13:30:19 +0100 Subject: [PATCH 2/2] zypp: ignore @System upgrades during update In case of update, there are always 2 pool items that are affected, the new version from the repo to be installed and the old version in @System to be removed - but the user is only interested in one, so ignore the @System one --- backends/zypp/zypp-utils.cpp | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 002c99b..27bcbc4 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -434,35 +434,35 @@ zypp_get_package_by_id (const gchar *package_id) it != pool.byNameEnd (id_parts[PK_PACKAGE_ID_NAME]); ++it) { sat::Solvable pkg = it->satSolvable(); - MIL << "match " << package_id << " " << pkg << endl; + //MIL << "match " << package_id << " " << pkg << endl; if (want_source && !isKind<SrcPackage>(pkg)) { - MIL << "not a src package\n"; + //MIL << "not a src package\n"; continue; } if (!want_source && (isKind<SrcPackage>(pkg) || g_strcmp0 (pkg.arch().c_str(), arch))) { - MIL << "not a matching arch\n"; + //MIL << "not a matching arch\n"; continue; } const string &ver = pkg.edition ().asString(); if (g_strcmp0 (ver.c_str (), id_parts[PK_PACKAGE_ID_VERSION])) { - MIL << "not a matching version\n"; + //MIL << "not a matching version\n"; continue; } if (!pkg.isSystem()) { if (!strncmp(id_parts[PK_PACKAGE_ID_DATA], "installed", 9)) { - MIL << "pkg is not installed\n"; + //MIL << "pkg is not installed\n"; continue; } if (g_strcmp0(pkg.repository().alias().c_str(), id_parts[PK_PACKAGE_ID_DATA])) { - MIL << "repo does not match\n"; + //MIL << "repo does not match\n"; continue; } } else if (strncmp(id_parts[PK_PACKAGE_ID_DATA], "installed", 9)) { - MIL << "pkg installed\n"; + //MIL << "pkg installed\n"; continue; } @@ -881,7 +881,7 @@ zypp_check_restart (PkRestartEnum *restart, Patch::constPtr patch) gboolean zypp_perform_execution (PkBackendJob *job, ZYpp::Ptr zypp, PerformType type, gboolean force, PkBitfield transaction_flags) { - MIL << force << pk_filter_bitfield_to_string(transaction_flags) << endl; + MIL << force << " " << pk_filter_bitfield_to_string(transaction_flags) << endl; gboolean ret = FALSE; PkBackend *backend = PK_BACKEND(pk_backend_job_get_backend(job)); @@ -935,19 +935,23 @@ zypp_perform_execution (PkBackendJob *job, ZYpp::Ptr zypp, PerformType type, gbo case UPDATE: pk_backend_job_set_status (job, PK_STATUS_ENUM_UPDATE); break; - }; + } ResPool pool = ResPool::instance (); if (pk_bitfield_contain (transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE)) { ret = TRUE; - g_debug ("simulating"); + MIL << "simulating" << endl; for (ResPool::const_iterator it = pool.begin (); it != pool.end (); ++it) { if (type == REMOVE && !(*it)->isSystem ()) { it->statusReset (); continue; } + // for updates we only care for updates + if (type == UPDATE && it->status ().isToBeUninstalledDueToUpgrade ()) + continue; + if (!zypp_backend_pool_item_notify (job, *it, TRUE)) ret = FALSE; it->statusReset (); @@ -1010,15 +1014,15 @@ zypp_perform_execution (PkBackendJob *job, ZYpp::Ptr zypp, PerformType type, gbo if ( separator ) todolist << separator << it->ident(); else - { + { todolist << it->ident(); separator = '\n'; } } pk_backend_job_error_code (job, PK_ERROR_ENUM_TRANSACTION_ERROR, - "Transaction could not be completed.\n Theses packages could not be installed: %s", - todolist.str().c_str()); + "Transaction could not be completed.\n Theses packages could not be installed: %s", + todolist.str().c_str()); goto exit; } @@ -1165,10 +1169,12 @@ zypp_backend_pool_item_notify (PkBackendJob *job, PkInfoEnum status = PK_INFO_ENUM_UNKNOWN; if (item.status ().isToBeUninstalledDueToUpgrade ()) { + MIL << "updating " << item << endl; status = PK_INFO_ENUM_UPDATING; } else if (item.status ().isToBeUninstalledDueToObsolete ()) { status = PK_INFO_ENUM_OBSOLETING; } else if (item.status ().isToBeInstalled ()) { + MIL << "installing " << item << endl; status = PK_INFO_ENUM_INSTALLING; } else if (item.status ().isToBeUninstalled ()) { status = PK_INFO_ENUM_REMOVING; -- 1.8.1.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
