commit PackageKit for openSUSE:11.4
Hello community, here is the log from the commit of package PackageKit for openSUSE:11.4 checked in at Mon Nov 14 17:03:15 CET 2011. -------- --- old-versions/11.4/UPDATES/all/PackageKit/PackageKit.changes 2011-06-01 15:07:58.000000000 +0200 +++ 11.4/PackageKit/PackageKit.changes 2011-10-19 13:16:27.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 19 11:15:18 UTC 2011 - dmacvicar@suse.de + +- backport fix for bnc#679649 + added workaround for package search functions + PackageKit looping initializing repos taking long time + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- 0001-zypp-log-to-ZYpp-s-log-the-start-of-a-PK-backend-fun.patch 0002-zypp-fix-deletion-of-package-locks-bnc-690038.patch PackageKit-sysconfig-cron.patch bmc-17596.patch fix-plugin.patch New: ---- 0001-make-debugging-easier.patch 0002-fix-lost-locks-bnc-690038.patch 0003-fix-slowness-bnc-679650.patch 0004-Change-the-configuration-of-the-cron-script-to-a-sys.patch 0005-fix-build-with-11.4-gtk2-2.21.patch 0006-dont-call-build-pool-inside-the-loop.patch 0007-only-load-repositories-once.patch 0008-bmc-17596-meego-PackageKit-hangs-during-some-transac.patch 0009-Workaround-Don-t-refresh-repositories-each-time-for-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.OvWU0C/_old 2011-11-14 17:02:37.000000000 +0100 +++ /var/tmp/diff_new_pack.OvWU0C/_new 2011-11-14 17:02:37.000000000 +0100 @@ -35,7 +35,7 @@ Name: PackageKit Version: 0.6.14 -Release: 0.<RELEASE4> +Release: 0.<RELEASE6> License: GPLv2+ BuildRequires: NetworkManager-devel BuildRequires: dbus-1-glib-devel @@ -64,16 +64,24 @@ Summary: Simple software installation management software Url: http://packagekit.org/ Source: %{name}-%{version}.tar.bz2 -# PATCH-FEATURE-OPENSUSE PackageKit-sysconfig-cron.patch vuntz@opensuse.org -- Change the configuration of the cron script to a sysconfig-like config -Patch0: PackageKit-sysconfig-cron.patch -# PATCH-FIX-UPSTREAM 0001-zypp-log-to-ZYpp-s-log-the-start-of-a-PK-backend-fun.patch dmacvicar@suse.de -- make debugging easier -Patch1: 0001-zypp-log-to-ZYpp-s-log-the-start-of-a-PK-backend-fun.patch +# PATCH-FIX-UPSTREAM 0001-make-debugging-easier.patch dmacvicar@suse.de -- make debugging easier +Patch0: 0001-make-debugging-easier.patch # PATCH-FIX-UPSTREAM 0002-zypp-fix-deletion-of-package-locks-bnc-690038.patch dmacvicar@suse.de -- fix lost locks (bnc#690038) -Patch2: 0002-zypp-fix-deletion-of-package-locks-bnc-690038.patch -# PATCH-FIX-OPENSUSE fix-plugin.patch meissner@suse.de -- fix build with 11.4 gtk2 2.21. -Patch3: fix-plugin.patch -# PATCH-FIX-OPENSUSE bmc-17596.patch https://bugs.meego.com/show_bug.cgi?id=17596 fixes overflow -Patch4: bmc-17596.patch +Patch1: 0002-fix-lost-locks-bnc-690038.patch +Patch2: 0003-fix-slowness-bnc-679650.patch +# PATCH-FEATURE-OPENSUSE PackageKit-sysconfig-cron.patch vuntz@opensuse.org -- Change the configuration of the cron script to a sysconfig-like config +Patch3: 0004-Change-the-configuration-of-the-cron-script-to-a-sys.patch +# PATCH-FIX-OPENSUSE 0005-fix-build-with-11.4-gtk2-2.21.patch meissner@suse.de -- fix build with 11.4 gtk2 2.21. +Patch4: 0005-fix-build-with-11.4-gtk2-2.21.patch +# PATCH-FIX-OPENSUSE 0006-dont-call-build-pool-inside-the-loop.patch backport fix for bnc#679650 +Patch5: 0006-dont-call-build-pool-inside-the-loop.patch +# PATCH-FIX-OPENSUSE 0007-only-load-repositories-once.patch backport fix for bnc#679650 +Patch6: 0007-only-load-repositories-once.patch +# PATCH-FIX-UPSTREAM 0008-bmc-17596-meego-PackageKit-hangs-during-some-transac.patch fixes overflow +Patch7: 0008-bmc-17596-meego-PackageKit-hangs-during-some-transac.patch +# PATCH-FIX-UPSTREAM 0009-Workaround-Don-t-refresh-repositories-each-time-for-.patch fix #2 for bnc#679650 +Patch8: 0009-Workaround-Don-t-refresh-repositories-each-time-for-.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-branding = %{version} Recommends: %{name}-lang @@ -293,6 +301,10 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build %configure \ ++++++ 0001-make-debugging-easier.patch ++++++
From 4d5c6b804241c32ecbc0a82208d3f92da2cbf075 Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P
Date: Tue, 26 Jul 2011 11:31:08 +0200 Subject: [PATCH 1/8] make debugging easier
---
backends/zypp/pk-backend-zypp.cpp | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index 3968f01..51bb3e4 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -29,6 +29,7 @@
#include
From 3c2a8d2078036307aa594cf7bf699383e7584cf3 Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P
Date: Tue, 26 Jul 2011 11:31:48 +0200 Subject: [PATCH 2/8] fix lost locks (bnc#690038)
---
backends/zypp/pk-backend-zypp.cpp | 79 +++++++++++++++++--------------------
1 files changed, 36 insertions(+), 43 deletions(-)
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index 51bb3e4..85b7cbb 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -84,6 +84,22 @@ static map
From 5f1d1aeb570c5b4a711ec82447975e66a3443fca Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P
Date: Tue, 26 Jul 2011 11:32:59 +0200 Subject: [PATCH 3/8] fix slowness (bnc#679650)
--- backends/zypp/zypp-utils.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 68d59da..8fc69bd 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -352,7 +352,7 @@ zypp_get_packages_by_name (PkBackend *backend, vectorsat::Solvable &result, gboolean include_local) { - ResPool pool = zypp_build_pool (backend, include_local); + ResPool pool(ResPool::instance()); for (ResPool::byIdent_iterator it = pool.byIdentBegin (kind, package_name); it != pool.byIdentEnd (kind, package_name); it++) { -- 1.7.6.4 ++++++ 0004-Change-the-configuration-of-the-cron-script-to-a-sys.patch ++++++
From 0762e3890582a3374eea794a2e1ca12c2bcdac43 Mon Sep 17 00:00:00 2001 From: Vincent Untz
Date: Tue, 26 Jul 2011 11:34:22 +0200 Subject: [PATCH 4/8] Change the configuration of the cron script to a sysconfig-like config
--- contrib/cron/packagekit-background | 43 +++++++++++++++++++++++++++-------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/contrib/cron/packagekit-background b/contrib/cron/packagekit-background index e5b5c9b..783e2df 100644 --- a/contrib/cron/packagekit-background +++ b/contrib/cron/packagekit-background @@ -1,18 +1,41 @@ -# should we attempt to do this? (valid: yes|no) +## Path: System/Cron/PackageKit +## Description: Cron job to update the system daily with PackageKit + +## Type: yesno +## Default: no +# +# Run the cron job. +# ENABLED=no -# don't install, just check (valid: yes|no) +## Type: yesno +## Default: no +# +# Check if updates are available, instead of installing. +# CHECK_ONLY=no -# if MAILTO is set, the mail command is used to deliver PackageKit output -# by default MAILTO is unset, so crond mails the output by itself -#MAILTO=root +## Type: string +## Default: "" +# +# If MAILTO is set, the mail command is used to deliver PackageKit output. +# By default MAILTO is unset, so crond mails the output by itself. +# +MAILTO="" -# you may set SYSTEM_NAME if you want your PackageKit emails tagged -# differently default is output of hostname command -#SYSTEM_NAME="" +## Type: string +## Default: "" +# +# You may set SYSTEM_NAME if you want your PackageKit emails tagged differently. +# Default is output of hostname command. +# +SYSTEM_NAME="" -# update checks will sleep random time before contacting the servers to +## Type: integer +## Default: 3600 +# +# Update checks will sleep random time before contacting the servers to # avoid hammering them with thousands of request at the same time - this -# is the maximum sleep time (in seconds) for the random wait period +# is the maximum sleep time (in seconds) for the random wait period. +# SLEEP_MAX=3600 -- 1.7.6.4 ++++++ 0005-fix-build-with-11.4-gtk2-2.21.patch ++++++
From dd0fc72535c813d3ab43f5081aa814a479c9da7e Mon Sep 17 00:00:00 2001 From: Marcus Meissner
Date: Tue, 26 Jul 2011 11:35:18 +0200 Subject: [PATCH 5/8] fix build with 11.4 gtk2 2.21
--- contrib/browser-plugin/pk-main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/browser-plugin/pk-main.c b/contrib/browser-plugin/pk-main.c index b9378cb..62914e0 100644 --- a/contrib/browser-plugin/pk-main.c +++ b/contrib/browser-plugin/pk-main.c @@ -219,7 +219,7 @@ pk_main_create_window (PkPlugin *plugin) } /* get parent */ - parent = gdk_x11_window_foreign_new_for_display (gdk_display, xwindow); + parent = gdk_window_foreign_new_for_display (gdk_display, xwindow); if (parent == NULL) { pk_debug ("invalid window given for setup (id %lu)\n", xwindow); return; -- 1.7.6.4 ++++++ 0006-dont-call-build-pool-inside-the-loop.patch ++++++
From 8d0be51e6a5380cbf1dc373eb7bd5d98db04e518 Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P
Date: Tue, 26 Jul 2011 11:21:37 +0200 Subject: [PATCH 6/8] dont call build pool inside the loop
--- backends/zypp/pk-backend-zypp.cpp | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index 85b7cbb..e885cb0 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -185,13 +185,12 @@ backend_get_requires_thread (PkBackend *backend) //pk_backend_set_percentage (backend, 0); PoolStatusSaver saver; + ResPool pool = zypp_build_pool (backend, true); for (uint i = 0; package_ids[i]; i++) { sat::Solvable solvable = zypp_get_package_by_id (backend, package_ids[i]); PoolItem package; if (solvable.isSystem ()) { - ResPool pool = zypp_build_pool (backend, true); - gboolean found = FALSE; gchar **id_parts = pk_package_id_split (package_ids[i]); -- 1.7.6.4 ++++++ 0007-only-load-repositories-once.patch ++++++
From 724c2bf491a34a800604b2ac333906e656c46a2e Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P
Date: Tue, 26 Jul 2011 11:20:51 +0200 Subject: [PATCH 7/8] only load repositories once
From b8d9fec8c8951f2b1da53c40db9d00e500388474 Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P
Date: Mon, 10 Oct 2011 13:58:55 +0200 Subject: [PATCH 8/8] bmc#17596 (meego) - PackageKit hangs during some
---
backends/zypp/zypp-utils.cpp | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp
index 8fc69bd..4b84300 100644
--- a/backends/zypp/zypp-utils.cpp
+++ b/backends/zypp/zypp-utils.cpp
@@ -192,8 +192,11 @@ zypp_is_valid_repo (PkBackend *backend, RepoInfo repo)
ResPool
zypp_build_pool (PkBackend *backend, gboolean include_local)
{
+ static gboolean repos_loaded = FALSE;
+
ZYpp::Ptr zypp = get_zypp (backend);
+ // the target is loaded or unloaded on request
if (include_local) {
// FIXME have to wait for fix in zypp (repeated loading of target)
if (sat::Pool::instance().reposFind( sat::Pool::systemRepoAlias() ).solvablesEmpty ())
@@ -211,6 +214,10 @@ zypp_build_pool (PkBackend *backend, gboolean include_local)
}
}
+ // we only load repositories once.
+ if (repos_loaded)
+ return zypp->pool();
+
// Add resolvables from enabled repos
RepoManager manager;
list<RepoInfo> repos;
@@ -230,7 +237,9 @@ zypp_build_pool (PkBackend *backend, gboolean include_local)
//FIXME see above, skip already cached repos
if (sat::Pool::instance().reposFind( repo.alias ()) == Repository::noRepository)
manager.loadFromCache (repo);
+
}
+ repos_loaded = true;
} catch (const repo::RepoNoAliasException &ex) {
g_error ("Can't figure an alias to look in cache");
} catch (const repo::RepoNotCachedException &ex) {
--
1.7.6.4
++++++ 0008-bmc-17596-meego-PackageKit-hangs-during-some-transac.patch ++++++
transactions (edit)
---
backends/zypp/zypp-events.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/backends/zypp/zypp-events.h b/backends/zypp/zypp-events.h
index 5877f8d..0ea0dd6 100644
--- a/backends/zypp/zypp-events.h
+++ b/backends/zypp/zypp-events.h
@@ -303,7 +303,7 @@ struct DownloadProgressReportReceiver : public zypp::callback::ReceiveReport From 9a704288d7e68cf4a8cbc6203616fdd5b62691be Mon Sep 17 00:00:00 2001
From: Duncan Mac-Vicar P ---
backends/zypp/pk-backend-zypp.cpp | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index e885cb0..a893977 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -1398,6 +1398,8 @@ pk_backend_resolve (PkBackend *backend, PkBitfield filters, gchar **package_ids)
static gboolean
backend_find_packages_thread (PkBackend *backend)
{
+ static bool refreshed = false;
+
MIL << endl;
gchar **values;
const gchar *search;
@@ -1411,9 +1413,13 @@ backend_find_packages_thread (PkBackend *backend)
}
// refresh the repos before searching
- if (!zypp_refresh_cache (backend, FALSE)) {
- pk_backend_finished (backend);
- return FALSE;
+ if (!refreshed) {
+ if (!zypp_refresh_cache (backend, FALSE)) {
+ pk_backend_finished (backend);
+ return FALSE;
+ }
+ else
+ refreshed = true;
}
values = pk_backend_get_strv (backend, "search");
@@ -2075,10 +2081,15 @@ backend_download_packages_thread (PkBackend *backend)
MIL << endl;
gchar **package_ids;
gulong size = 0;
+ static bool refreshed = false;
- if (!zypp_refresh_cache (backend, FALSE)) {
- pk_backend_finished (backend);
- return FALSE;
+ if (! refreshed) {
+ if (!zypp_refresh_cache (backend, FALSE)) {
+ pk_backend_finished (backend);
+ return FALSE;
+ }
+ else
+ refreshed = true;
}
ZYpp::Ptr zypp;
--
1.7.6.4
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de