Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sbd for openSUSE:Factory checked in at 2021-01-22 21:53:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbd (Old) and /work/SRC/openSUSE:Factory/.sbd.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbd" Fri Jan 22 21:53:02 2021 rev:38 rq:866040 version:1.4.2+20201214.01c18c7 Changes: -------- --- /work/SRC/openSUSE:Factory/sbd/sbd.changes 2020-12-07 15:01:48.428808722 +0100 +++ /work/SRC/openSUSE:Factory/.sbd.new.28504/sbd.changes 2021-01-22 21:53:27.977946282 +0100 @@ -1,0 +2,6 @@ +Thu Jan 21 12:30:37 UTC 2021 - Yan Gao <[email protected]> + +- Update to version 1.4.2+20201214.01c18c7: +- sbd-inquisitor: check SBD_SYNC_RESOURCE_STARTUP only in watch mode (bsc#1180966) + +------------------------------------------------------------------- Old: ---- sbd-1.4.2+20201202.0446439.tar.xz New: ---- sbd-1.4.2+20201214.01c18c7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbd.spec ++++++ --- /var/tmp/diff_new_pack.FGZeiU/_old 2021-01-22 21:53:28.489947008 +0100 +++ /var/tmp/diff_new_pack.FGZeiU/_new 2021-01-22 21:53:28.489947008 +0100 @@ -1,7 +1,7 @@ # # spec file for package sbd # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2013 Lars Marowsky-Bree # # All modifications and additions to the file contributed by third parties @@ -33,7 +33,7 @@ %global sync_resource_startup_sysconfig no Name: sbd -Version: 1.4.2+20201202.0446439 +Version: 1.4.2+20201214.01c18c7 Release: 0 Summary: Storage-based death License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.FGZeiU/_old 2021-01-22 21:53:28.525947059 +0100 +++ /var/tmp/diff_new_pack.FGZeiU/_new 2021-01-22 21:53:28.525947059 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/sbd.git</param> - <param name="changesrevision">044643922c3044c0bac2f91b1382ff3f2c64a4a2</param> + <param name="changesrevision">cc46bb4aaa8c0cde5c09f6d71471e402663f96e0</param> </service> </servicedata> \ No newline at end of file ++++++ sbd-1.4.2+20201202.0446439.tar.xz -> sbd-1.4.2+20201214.01c18c7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.2+20201202.0446439/src/sbd-inquisitor.c new/sbd-1.4.2+20201214.01c18c7/src/sbd-inquisitor.c --- old/sbd-1.4.2+20201202.0446439/src/sbd-inquisitor.c 2020-12-02 21:26:13.000000000 +0100 +++ new/sbd-1.4.2+20201214.01c18c7/src/sbd-inquisitor.c 2020-12-14 09:35:08.000000000 +0100 @@ -972,25 +972,6 @@ } } - value = getenv("SBD_SYNC_RESOURCE_STARTUP"); - sync_resource_startup = - crm_is_true(value?value:SBD_SYNC_RESOURCE_STARTUP_DEFAULT); - -#if !USE_PACEMAKERD_API - if (sync_resource_startup) { - fprintf(stderr, "Failed to sync resource-startup as " - "SBD was built against pacemaker not supporting pacemakerd-API.\n"); - exit_status = -1; - goto out; - } -#else - if (!sync_resource_startup) { - cl_log(LOG_WARNING, "SBD built against pacemaker supporting " - "pacemakerd-API. Should think about enabling " - "SBD_SYNC_RESOURCE_STARTUP."); - } -#endif - while ((c = getopt(argc, argv, "czC:DPRTWZhvw:d:n:p:1:2:3:4:5:t:I:F:S:s:r:")) != -1) { switch (c) { case 'D': @@ -1127,6 +1108,27 @@ } } + if (strcmp(argv[optind], "watch") == 0) { + value = getenv("SBD_SYNC_RESOURCE_STARTUP"); + sync_resource_startup = + crm_is_true(value?value:SBD_SYNC_RESOURCE_STARTUP_DEFAULT); + +#if !USE_PACEMAKERD_API + if (sync_resource_startup) { + fprintf(stderr, "Failed to sync resource-startup as " + "SBD was built against pacemaker not supporting pacemakerd-API.\n"); + exit_status = -1; + goto out; + } +#else + if (!sync_resource_startup) { + cl_log(LOG_WARNING, "SBD built against pacemaker supporting " + "pacemakerd-API. Should think about enabling " + "SBD_SYNC_RESOURCE_STARTUP."); + } +#endif + } + if (disk_count == 0) { /* if we already have disks from commandline then it is probably undesirable to add those
