Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2013-01-24 10:47:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2013-01-22 17:40:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2013-01-24 10:47:17.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 21 17:22:28 UTC 2013 - [email protected] + +- two more patches from git: + 0010-zypp-ignore-system-resolvables-during-install-too.patch + 0009-zypp-merge-all-backend-code-into-one-file-much-easie.patch + +------------------------------------------------------------------- New: ---- 0009-zypp-merge-all-backend-code-into-one-file-much-easie.patch 0010-zypp-ignore-system-resolvables-during-install-too.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.j3qUsw/_old 2013-01-24 10:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.j3qUsw/_new 2013-01-24 10:47:18.000000000 +0100 @@ -46,6 +46,10 @@ Patch8: 0007-fix-crash-while-calling-inhibit-into-systemd-login.patch # PATCH-FIX-UPSTREAM 0008-zypp-ignore-System-upgrades-during-update.patch [email protected] -- avoid useless confirmations Patch9: 0008-zypp-ignore-System-upgrades-during-update.patch +# PATCH-FIX-UPSTREAM 0009-zypp-merge-all-backend-code-into-one-file-much-easie.patch [email protected] -- code refactoring +Patch10: 0009-zypp-merge-all-backend-code-into-one-file-much-easie.patch +# PATCH-FIX-UPSTREAM 0010-zypp-ignore-system-resolvables-during-install-too.patch [email protected] -- avoid useless confirmations 2 +Patch11: 0010-zypp-ignore-system-resolvables-during-install-too.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 @@ -273,6 +277,8 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 +%patch11 -p1 translation-update-upstream %build ++++++ 0009-zypp-merge-all-backend-code-into-one-file-much-easie.patch ++++++ ++++ 3746 lines (skipped) ++++++ 0010-zypp-ignore-system-resolvables-during-install-too.patch ++++++ >From c4e3c0fe11ce787c7925d4e208a698dda4c32968 Mon Sep 17 00:00:00 2001 From: Stephan Kulow <[email protected]> Date: Mon, 21 Jan 2013 17:15:44 +0100 Subject: [PATCH 2/2] zypp: ignore system resolvables during install too There is no perfect solution for that, but if I install something, everything that is upgraded will have a replacement from the repo, so listing it, is not interesting to me. problem is that pkcon says I need to install foo-1.2 if in reality there is an update going on from foo-1.1 to foo-1.2, but as packages are identified by their name+version+repo, I have to pick one --- backends/zypp/pk-backend-zypp.cpp | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index c4f6e02..0d8f51a 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -1396,15 +1396,15 @@ zypp_perform_execution (PkBackendJob *job, ZYpp::Ptr zypp, PerformType type, gbo } switch (type) { - case INSTALL: - pk_backend_job_set_status (job, PK_STATUS_ENUM_INSTALL); - break; - case REMOVE: - pk_backend_job_set_status (job, PK_STATUS_ENUM_REMOVE); - break; - case UPDATE: - pk_backend_job_set_status (job, PK_STATUS_ENUM_UPDATE); - break; + case INSTALL: + pk_backend_job_set_status (job, PK_STATUS_ENUM_INSTALL); + break; + case REMOVE: + pk_backend_job_set_status (job, PK_STATUS_ENUM_REMOVE); + break; + case UPDATE: + pk_backend_job_set_status (job, PK_STATUS_ENUM_UPDATE); + break; } ResPool pool = ResPool::instance (); @@ -1414,14 +1414,21 @@ zypp_perform_execution (PkBackendJob *job, ZYpp::Ptr zypp, PerformType type, gbo MIL << "simulating" << endl; for (ResPool::const_iterator it = pool.begin (); it != pool.end (); ++it) { - if (type == REMOVE && !(*it)->isSystem ()) { - it->statusReset (); - continue; + switch (type) { + case REMOVE: + if (!(*it)->isSystem ()) { + it->statusReset (); + continue; + } + break; + case INSTALL: + case UPDATE: + // for updates we only care for updates + if (it->status ().isToBeUninstalledDueToUpgrade ()) + continue; + break; } - // 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 (); -- 1.8.1.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
