Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2015-11-18 22:33:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2015-11-12 19:36:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2015-11-18 22:33:26.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Nov 13 16:17:39 UTC 2015 - [email protected] + +- Add PackageKit-avoid-endless-loop-on-autoupdate.patch: Avoid a + endless loop on autoupdates. + +------------------------------------------------------------------- +Fri Nov 13 16:16:15 UTC 2015 - [email protected] + +- Add PackageKit-fix-offline-trigger.patch: Fix the PK trigger + detection: if not done properly, PK might believe that something + else triggered the system update and expects something else to + handle the update (boo#954125). + +------------------------------------------------------------------- New: ---- PackageKit-avoid-endless-loop-on-autoupdate.patch PackageKit-fix-offline-trigger.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.wV3qQJ/_old 2015-11-18 22:33:27.000000000 +0100 +++ /var/tmp/diff_new_pack.wV3qQJ/_new 2015-11-18 22:33:27.000000000 +0100 @@ -35,6 +35,10 @@ # PATCH-FIX-UPSTREAM PackageKit-dbus-location.patch bnc#829944 [email protected] -- Look for dbus socket in /run instead of /var/run. Sent to upstream. Patch3: PackageKit-dbus-location.patch Patch4: PackageKit-1.0.1-fix-bashisms.patch +# PATCH-FIX-UPSTREAM PackageKit-fix-offline-trigger.patch boo#954125 [email protected] -- Fix the PK trigger detection; if not done properly, PK might believe that something else triggered the system update and expects something else to handle the update +Patch5: PackageKit-fix-offline-trigger.patch +# PATCH-FIX-UPSTREAM PackageKit-avoid-endless-loop-on-autoupdate.patch [email protected] -- Avoid a endless loop on autoupdates. +Patch6: PackageKit-avoid-endless-loop-on-autoupdate.patch BuildRequires: NetworkManager-devel BuildRequires: automake BuildRequires: docbook-utils @@ -237,6 +241,8 @@ %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 translation-update-upstream %build ++++++ PackageKit-avoid-endless-loop-on-autoupdate.patch ++++++ ndex: PackageKit-1.0.10/backends/zypp/pk-backend-zypp.cpp =================================================================== --- PackageKit-1.0.10.orig/backends/zypp/pk-backend-zypp.cpp +++ PackageKit-1.0.10/backends/zypp/pk-backend-zypp.cpp @@ -1471,6 +1471,7 @@ zypp_perform_execution (PkBackendJob *jo for (ResPool::const_iterator it = pool.begin (); it != pool.end (); ++it) { if (it->status ().isToBeInstalled ()) _dl_count++; +#ifdef SLE if (it->status ().isToBeInstalled () && !(it->resolvable()->licenseToConfirm().empty ())) { gchar *eula_id = g_strdup ((*it)->name ().c_str ()); gboolean has_eula = pk_backend_is_eula_valid (backend, eula_id); @@ -1488,6 +1489,7 @@ zypp_perform_execution (PkBackendJob *jo } g_free (eula_id); } +#endif } // Perform the installation ++++++ PackageKit-fix-offline-trigger.patch ++++++ Index: PackageKit-1.0.10/lib/packagekit-glib2/pk-offline.c =================================================================== --- PackageKit-1.0.10.orig/lib/packagekit-glib2/pk-offline.c +++ PackageKit-1.0.10/lib/packagekit-glib2/pk-offline.c @@ -238,8 +238,7 @@ pk_offline_get_action (GError **error) g_return_val_if_fail (error == NULL || *error == NULL, PK_OFFLINE_ACTION_UNKNOWN); /* is the trigger set? */ - if (!g_file_test (PK_OFFLINE_TRIGGER_FILENAME, G_FILE_TEST_EXISTS) || - !g_file_test (PK_OFFLINE_ACTION_FILENAME, G_FILE_TEST_EXISTS)) + if (!g_file_test (PK_OFFLINE_ACTION_FILENAME, G_FILE_TEST_EXISTS)) return PK_OFFLINE_ACTION_UNSET; /* read data file */
