Hello community, here is the log from the commit of package rollback-helper for openSUSE:Factory checked in at 2018-11-22 13:26:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rollback-helper (Old) and /work/SRC/openSUSE:Factory/.rollback-helper.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rollback-helper" Thu Nov 22 13:26:20 2018 rev:6 rq:650633 version:1.0+git20181112.65db4d0 Changes: -------- --- /work/SRC/openSUSE:Factory/rollback-helper/rollback-helper.changes 2018-04-27 10:49:12.284258652 +0200 +++ /work/SRC/openSUSE:Factory/.rollback-helper.new.19453/rollback-helper.changes 2018-11-22 13:26:47.917920187 +0100 @@ -1,0 +2,7 @@ +Wed Nov 14 15:53:09 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 1.0+git20181112.65db4d0: + * Run before any other services calling zypper (bsc#1113048) + * Retry network connection if it doesn't work yet (bsc#1108618) + +------------------------------------------------------------------- Old: ---- rollback-helper-1.0+git20180419.3c7281d.tar.xz New: ---- rollback-helper-1.0+git20181112.65db4d0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rollback-helper.spec ++++++ --- /var/tmp/diff_new_pack.GwBZhs/_old 2018-11-22 13:26:49.169918878 +0100 +++ /var/tmp/diff_new_pack.GwBZhs/_new 2018-11-22 13:26:49.169918878 +0100 @@ -17,7 +17,7 @@ Name: rollback-helper -Version: 1.0+git20180419.3c7281d +Version: 1.0+git20181112.65db4d0 Release: 0 Summary: Helper Scripts for system rollback License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.GwBZhs/_old 2018-11-22 13:26:49.213918832 +0100 +++ /var/tmp/diff_new_pack.GwBZhs/_new 2018-11-22 13:26:49.213918832 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/rollback-helper.git</param> - <param name="changesrevision">3c7281dbf3153304e90ce9aeef2306cc1a0fbd7c</param> + <param name="changesrevision">36bce84a6755f4cab94d27aff4085fa75b6bf89d</param> </service> </servicedata> \ No newline at end of file ++++++ rollback-helper-1.0+git20180419.3c7281d.tar.xz -> rollback-helper-1.0+git20181112.65db4d0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rollback-helper-1.0+git20180419.3c7281d/sbin/rollback-reset-registration new/rollback-helper-1.0+git20181112.65db4d0/sbin/rollback-reset-registration --- old/rollback-helper-1.0+git20180419.3c7281d/sbin/rollback-reset-registration 2018-04-19 14:18:00.000000000 +0200 +++ new/rollback-helper-1.0+git20181112.65db4d0/sbin/rollback-reset-registration 2018-11-12 14:15:38.000000000 +0100 @@ -21,6 +21,13 @@ exit fi -if SUSEConnect --rollback; then - rm -f ${VARDIR}/check-registration -fi +# systemd does currently not support "Restart=" for oneshot services +# (https://github.com/systemd/systemd/issues/2582), so implement a manual +# retry algorithm +for i in {1..5}; do + [ $i == 1 ] || sleep 2 + if SUSEConnect --rollback; then + rm -f ${VARDIR}/check-registration + exit 0 + fi +done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rollback-helper-1.0+git20180419.3c7281d/systemd/rollback.service new/rollback-helper-1.0+git20181112.65db4d0/systemd/rollback.service --- old/rollback-helper-1.0+git20180419.3c7281d/systemd/rollback.service 2018-04-19 14:18:00.000000000 +0200 +++ new/rollback-helper-1.0+git20181112.65db4d0/systemd/rollback.service 2018-11-12 14:15:38.000000000 +0100 @@ -3,6 +3,7 @@ DefaultDependencies=no Requires=network-online.target After=local-fs.target network-online.target +Before=transactional-update.timer salt-minion.service cloud-config.service ConditionPathExists=/var/lib/rollback/check-registration [Service]