Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2013-01-29 14:26:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-24 10:47:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2013-01-29 14:26:33.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 27 07:38:52 UTC 2013 - [email protected] + +- Add two more patches from git: + + 0011-zypp-Fix-compile-with-__attribute__-gnu_printf.patch + + 0012-zypp-less-debug-in-progress-functions.patch + +------------------------------------------------------------------- New: ---- 0011-zypp-Fix-compile-with-__attribute__-gnu_printf.patch 0012-zypp-less-debug-in-progress-functions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.agtmkd/_old 2013-01-29 14:26:34.000000000 +0100 +++ /var/tmp/diff_new_pack.agtmkd/_new 2013-01-29 14:26:34.000000000 +0100 @@ -50,6 +50,10 @@ 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 +# PATCH-FIX-UPSTREAM 0011-zypp-Fix-compile-with-__attribute__-gnu_printf.patch [email protected] -- minor bug fix +Patch12: 0011-zypp-Fix-compile-with-__attribute__-gnu_printf.patch +# PATCH-FIX-UPSTREAM 0012-zypp-less-debug-in-progress-functions.patch [email protected] -- less debug +Patch13: 0012-zypp-less-debug-in-progress-functions.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 @@ -279,6 +283,8 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 translation-update-upstream %build ++++++ 0011-zypp-Fix-compile-with-__attribute__-gnu_printf.patch ++++++ >From 303ad61ff5fb25d68da31457dc88c419a7e27155 Mon Sep 17 00:00:00 2001 From: Stephan Kulow <[email protected]> Date: Tue, 22 Jan 2013 13:00:25 +0100 Subject: [PATCH 06/12] zypp: Fix compile with __attribute__ gnu_printf --- backends/zypp/pk-backend-zypp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index 0d8f51a..0f32c18 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -680,7 +680,7 @@ zypp_is_valid_repo (PkBackendJob *job, RepoInfo repo) { if (repo.alias().empty()){ - pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR, "Repository has no or invalid repo name defined.\n", repo.alias ().c_str ()); + pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR, "%s: Repository has no or invalid repo name defined.\n", repo.alias ().c_str ()); return FALSE; } -- 1.8.1.1 ++++++ 0012-zypp-less-debug-in-progress-functions.patch ++++++ >From 90864427d3384363d82813cf5b69a4f74f4330f4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow <[email protected]> Date: Sun, 27 Jan 2013 08:34:46 +0100 Subject: [PATCH 12/12] zypp: less debug in progress functions Also remove the hacks trying to work around progress bugs - we need to fix that in rpm/zypp and don't try to hide it, creating new bugs --- backends/zypp/pk-backend-zypp.cpp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index 0f32c18..f492a1c 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -205,8 +205,8 @@ public: // fact that libzypp may skip over a "divisible by ten" // value (i.e., 28, 29, 31, 32). - MIL << percentage << " " << _sub_percentage << std::endl; - if (percentage <= _sub_percentage) + //MIL << percentage << " " << _sub_percentage << std::endl; + if (percentage == _sub_percentage) return; if (!_package_id) { @@ -236,8 +236,6 @@ protected: struct InstallResolvableReportReceiver : public zypp::callback::ReceiveReport<zypp::target::rpm::InstallResolvableReport>, ZyppBackendReceiver { zypp::Resolvable::constPtr _resolvable; - bool preparing; - int last_value; virtual void start (zypp::Resolvable::constPtr resolvable) { clear_package_id (); @@ -249,25 +247,14 @@ struct InstallResolvableReportReceiver : public zypp::callback::ReceiveReport<zy pk_backend_job_package (_job, PK_INFO_ENUM_INSTALLING, _package_id, summary); reset_sub_percentage (); } - // first we prepare then we install - preparing = true; - last_value = 0; g_free (summary); } virtual bool progress (int value, zypp::Resolvable::constPtr resolvable) { // we need to have extra logic here as progress is reported twice // and PackageKit does not like percentages going back - if (preparing && value < last_value) - preparing = false; - last_value = value; - MIL << preparing << " " << value << " " << _package_id << std::endl; - int perc = 0; - if (preparing) - perc = value * 30 / 100; - else - perc = 30 + value * 70 / 100; - update_sub_percentage (perc); + //MIL << value << " " << _package_id << std::endl; + update_sub_percentage (value); return true; } @@ -380,7 +367,7 @@ struct DownloadProgressReportReceiver : public zypp::callback::ReceiveReport<zyp virtual bool progress (int value, zypp::Resolvable::constPtr resolvable) { - MIL << resolvable << " " << value << " " << _package_id << std::endl; + //MIL << resolvable << " " << value << " " << _package_id << std::endl; update_sub_percentage (value); //pk_backend_job_set_speed (_job, static_cast<guint>(dbps_current)); return true; -- 1.8.1.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
