Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2018-09-05 13:47:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit" Wed Sep 5 13:47:34 2018 rev:178 rq:632820 version:1.1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2018-08-17 23:59:35.710268541 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2018-09-05 13:47:35.470160582 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 05:46:47 UTC 2018 - [email protected] + +- Add PackageKit-get-files-local.patch: Implement GetFilesLocal + method in zypp backend (bsc#1097581). + +------------------------------------------------------------------- New: ---- PackageKit-get-files-local.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.dlfSrw/_old 2018-09-05 13:47:36.158161735 +0200 +++ /var/tmp/diff_new_pack.dlfSrw/_new 2018-09-05 13:47:36.158161735 +0200 @@ -43,6 +43,8 @@ Patch0: PackageKit-avoid-endless-loop-on-autoupdate.patch # PATCH-FIX-OPENSUSE PackageKit-cron-without-sleep.patch boo#1071521 [email protected] -- Do not sleep in the cron job; our cron mechansim has sufficient randomization Patch2: PackageKit-cron-without-sleep.patch +# PATCH-FIX-UPSTREAM PackageKit-get-files-local.patch bsc#1097581 [email protected] -- Implement GetFilesLocal method in zypp backend +Patch3: PackageKit-get-files-local.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel @@ -222,6 +224,7 @@ %setup -q %patch0 -p1 %patch2 -p1 +%patch3 -p1 translation-update-upstream %build ++++++ PackageKit-get-files-local.patch ++++++ >From db9e6a239e9bb0b8927fe9f4f31a0c8409aacbfc Mon Sep 17 00:00:00 2001 From: xiaoguang wang <[email protected]> Date: Tue, 3 Jul 2018 15:26:09 +0800 Subject: [PATCH] zypp: Implement GetFilesLocal in zypp backend --- backends/zypp/pk-backend-zypp.cpp | 103 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 3 deletions(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index fffe4d337..717c71731 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -874,6 +874,26 @@ zypp_get_packages_by_file (ZYpp::Ptr zypp, } } +/** + * Return the package is from a local file or not. + */ +bool +zypp_package_is_local (const gchar *package_id) +{ + MIL << package_id << endl; + bool ret = false; + + if (!pk_package_id_check (package_id)) + return false; + + gchar **id_parts = pk_package_id_split (package_id); + if (!strncmp (id_parts[PK_PACKAGE_ID_DATA], "local", 5)) + ret = true; + + g_strfreev (id_parts); + return ret; +} + /** * Returns the Resolvable for the specified package_id. * e.g. gnome-packagekit;3.6.1-132.1;x86_64;G:F @@ -986,8 +1006,6 @@ static gboolean zypp_refresh_meta_and_cache (RepoManager &manager, RepoInfo &repo, bool force = false) { try { - sat::Pool pool = sat::Pool::instance (); - manager.refreshMetadata (repo, force ? RepoManager::RefreshForced : RepoManager::RefreshIfNeededIgnoreDelay); @@ -2093,6 +2111,11 @@ backend_get_details_thread (PkBackendJob *job, GVariant *params, gpointer user_d for (uint i = 0; package_ids[i]; i++) { MIL << package_ids[i] << endl; + if (zypp_package_is_local(package_ids[i])) { + pk_backend_job_details (job, package_ids[i], "", "", PK_GROUP_ENUM_UNKNOWN, "", "", (gulong)0); + return; + } + sat::Solvable solv = zypp_get_package_by_id( package_ids[i] ); if (zypp_is_no_solvable(solv)) { @@ -2182,14 +2205,23 @@ backend_get_details_local_thread (PkBackendJob *job, GVariant *params, gpointer return; } + gchar *package_id; + package_id = g_strjoin (";", rpmHeader->tag_name ().c_str(), + (rpmHeader->tag_version () + "-" + rpmHeader->tag_release ()).c_str(), + rpmHeader->tag_arch ().asString ().c_str(), + "local", + NULL); + pk_backend_job_details (job, - (rpmHeader->tag_name () + ";" + rpmHeader->tag_version () + "-" + rpmHeader->tag_release () + ";" + rpmHeader->tag_arch ().asString () + ";").c_str (), + package_id, rpmHeader->tag_summary ().c_str (), rpmHeader->tag_license ().c_str (), get_enum_group (rpmHeader->tag_group ()), rpmHeader->tag_description ().c_str (), rpmHeader->tag_url ().c_str (), (gulong)rpmHeader->tag_size ().blocks (zypp::ByteCount::B)); + + g_free (package_id); } } @@ -2202,6 +2234,71 @@ pk_backend_get_details_local (PkBackend *backend, PkBackendJob *job, gchar **ful pk_backend_job_thread_create (job, backend_get_details_local_thread, NULL, NULL); } +/** + * backend_get_files_local_thread: + */ +static void +backend_get_files_local_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +{ + MIL << endl; + RepoManager manager; + ZyppJob zjob(job); + ZYpp::Ptr zypp = zjob.get_zypp(); + + if (zypp == NULL) + return; + + gchar **full_paths; + g_variant_get (params, "(^a&s)", &full_paths); + + pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_percentage (job, 0); + + for (guint i = 0; full_paths[i]; i++) { + + // check if file is really a rpm + Pathname rpmPath (full_paths[i]); + target::rpm::RpmHeader::constPtr rpmHeader = target::rpm::RpmHeader::readPackage (rpmPath, target::rpm::RpmHeader::NOSIGNATURE); + + if (rpmHeader == NULL) { + zypp_backend_finished_error ( + job, PK_ERROR_ENUM_INTERNAL_ERROR, + "%s is not valid rpm-File", full_paths[i]); + return; + } + + gchar *package_id; + package_id = g_strjoin (";", rpmHeader->tag_name ().c_str(), + (rpmHeader->tag_version () + "-" + rpmHeader->tag_release ()).c_str(), + rpmHeader->tag_arch ().asString ().c_str(), + "local", + NULL); + + std::list<std::string> filenames = rpmHeader->tag_filenames (); + GPtrArray *array = g_ptr_array_new (); + + for (std::list<std::string>::iterator it = filenames.begin (); it != filenames.end (); it++) + g_ptr_array_add (array, g_strdup ((*it).c_str ())); + + g_ptr_array_add(array, NULL); + gchar **files_array = (gchar**)g_ptr_array_free (array, FALSE); + + pk_backend_job_files (job, package_id, files_array); + + g_free (package_id); + g_strfreev (files_array); + } +} + +/** + * pk_backend_get_files_local: + */ +void +pk_backend_get_files_local (PkBackend *backend, PkBackendJob *job, gchar **full_paths) +{ + pk_backend_job_thread_create (job, backend_get_files_local_thread, NULL, NULL); +} + static void backend_get_distro_upgrades_thread(PkBackendJob *job, GVariant *params, gpointer user_data) { -- 2.16.4
