Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2014-10-17 08:50:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/resource-agents (Old) and /work/SRC/openSUSE:Factory/.resource-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents" Changes: -------- --- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes 2014-09-17 21:23:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes 2014-10-17 08:50:54.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Oct 16 08:21:25 UTC 2014 - [email protected] + +- Update to upstream cs v3.9.5-589-gb644395 + - High: iSCSILogicalUnit: fixes syntax errors + - High: galera: do not ignore specified check_password + - Fix: shellfuncs: fix syntax error caused by exit_reason support for dash shell. + - Fix: ocf_exit_reason: implicit format string "%s" for single argument version + - Fix: ha_log: drop global __ha_log_ignore_stderr_once hack + - $((var++)) breaks in the dash shell + +------------------------------------------------------------------- Old: ---- resource-agents-3.9.5+git578.tar.xz New: ---- resource-agents-3.9.5+git589.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ --- /var/tmp/diff_new_pack.HANscl/_old 2014-10-17 08:50:54.000000000 +0200 +++ /var/tmp/diff_new_pack.HANscl/_new 2014-10-17 08:50:54.000000000 +0200 @@ -48,7 +48,7 @@ Summary: Open Source HA Reusable Cluster Resource Scripts License: GPL-2.0 and LGPL-2.1+ and GPL-3.0+ Group: Productivity/Clustering/HA -Version: 3.9.5+git578 +Version: 3.9.5+git589 Release: 0 Url: http://linux-ha.org/ Source: resource-agents-%{version}.tar.xz ++++++ resource-agents-3.9.5+git578.tar.xz -> resource-agents-3.9.5+git589.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.5+git578/configure.ac new/resource-agents-3.9.5+git589/configure.ac --- old/resource-agents-3.9.5+git578/configure.ac 2014-09-11 10:15:12.000000000 +0200 +++ new/resource-agents-3.9.5+git589/configure.ac 2014-09-27 13:49:54.000000000 +0200 @@ -911,7 +911,7 @@ AC_MSG_RESULT([]) AC_MSG_RESULT([$PACKAGE configuration:]) AC_MSG_RESULT([ Version = ${VERSION}]) -AC_MSG_RESULT([ Build Version = 5652c04b23a59017da64d65570be72a6764fdc4f]) +AC_MSG_RESULT([ Build Version = b644395182179ad500424dfbd648e2abd2c4ad69]) AC_MSG_RESULT([ Features =${PKG_FEATURES}]) AC_MSG_RESULT([]) AC_MSG_RESULT([ Prefix = ${prefix}]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.5+git578/heartbeat/exportfs new/resource-agents-3.9.5+git589/heartbeat/exportfs --- old/resource-agents-3.9.5+git578/heartbeat/exportfs 2014-09-11 10:15:12.000000000 +0200 +++ new/resource-agents-3.9.5+git589/heartbeat/exportfs 2014-09-27 13:49:54.000000000 +0200 @@ -181,7 +181,7 @@ CURRENT_FSID=$OCF_RESKEY_fsid } bump_fsid() { - let $((CURRENT_FSID++)) + CURRENT_FSID=$((CURRENT_FSID+1)) } get_fsid() { echo $CURRENT_FSID diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.5+git578/heartbeat/galera new/resource-agents-3.9.5+git589/heartbeat/galera --- old/resource-agents-3.9.5+git578/heartbeat/galera 2014-09-11 10:15:12.000000000 +0200 +++ new/resource-agents-3.9.5+git589/heartbeat/galera 2014-09-27 13:49:54.000000000 +0200 @@ -671,7 +671,7 @@ MYSQL_OPTIONS_CHECK="-nNE --user=${OCF_RESKEY_check_user}" if [ -n "${OCF_RESKEY_check_passwd}" ]; then - MYSQL_OPTIONS_CHECK="$MYSQL_OPTIONS_CHECK --password=${MYSQL_PASSWORD}" + MYSQL_OPTIONS_CHECK="$MYSQL_OPTIONS_CHECK --password=${OCF_RESKEY_check_passwd}" fi # What kind of method was invoked? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.5+git578/heartbeat/iSCSILogicalUnit new/resource-agents-3.9.5+git589/heartbeat/iSCSILogicalUnit --- old/resource-agents-3.9.5+git578/heartbeat/iSCSILogicalUnit 2014-09-11 10:15:12.000000000 +0200 +++ new/resource-agents-3.9.5+git589/heartbeat/iSCSILogicalUnit 2014-09-27 13:49:54.000000000 +0200 @@ -419,11 +419,11 @@ ${initiator} ${OCF_RESKEY_lun} || exit $OCF_ERR_GENERIC fi done - lun_configfs_path="/sys/kernel/config/target/iscsi/${OCF_RESKEY_target_iqn}/tpgt_1/lun/lun_#{${OCF_RESKEY_lun}/" + lun_configfs_path="/sys/kernel/config/target/iscsi/${OCF_RESKEY_target_iqn}/tpgt_1/lun/lun_${OCF_RESKEY_lun}/" if [ -e "${lun_configfs_path}" ]; then ocf_run lio_node --dellun=${OCF_RESKEY_target_iqn} 1 ${OCF_RESKEY_lun} || exit $OCF_ERR_GENERIC fi - block_configfs_path="/sys/kernel/config/target/core/iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESKEY_INSTANCE}/udev_path" + block_configfs_path="/sys/kernel/config/target/core/iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE}/udev_path" if [ -e "${block_configfs_path}" ]; then ocf_run tcm_node --freedev=iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE} || exit $OCF_ERR_GENERIC fi @@ -478,7 +478,7 @@ [ -e ${configfs_path} ] && [ `cat ${configfs_path}` = "${OCF_RESKEY_path}" ] && return $OCF_SUCCESS # if we aren't activated, is a block device still left over? - block_configfs_path="/sys/kernel/config/target/core/iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESKEY_INSTANCE}/udev_path" + block_configfs_path="/sys/kernel/config/target/core/iblock_${OCF_RESKEY_lio_iblock}/${OCF_RESOURCE_INSTANCE}/udev_path" [ -e ${block_configfs_path} ] && ocf_log warn "existing block without an active lun: ${block_configfs_path}" [ -e ${block_configfs_path} ] && return $OCF_ERR_GENERIC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resource-agents-3.9.5+git578/heartbeat/ocf-shellfuncs.in new/resource-agents-3.9.5+git589/heartbeat/ocf-shellfuncs.in --- old/resource-agents-3.9.5+git578/heartbeat/ocf-shellfuncs.in 2014-09-11 10:15:12.000000000 +0200 +++ new/resource-agents-3.9.5+git589/heartbeat/ocf-shellfuncs.in 2014-09-27 13:49:54.000000000 +0200 @@ -22,7 +22,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Build version: 5652c04b23a59017da64d65570be72a6764fdc4f +# Build version: b644395182179ad500424dfbd648e2abd2c4ad69 # TODO: Some of this should probably split out into a generic OCF # library for shell scripts, but for the time being, we'll just use it @@ -43,14 +43,6 @@ __SCRIPT_NAME=`basename $0` -# This is internal to shellfuncs. -# When set, ha_log can be used in a way that guarantees -# that stderr will not be printed to. This allows us to -# use ocf_exit_reason to print a string to stderr and use -# ha_log to print the same string to the other log facilities -# without having duplicate messages sent to stderr. -__ha_log_ignore_stderr_once="" - if [ -z "$OCF_ROOT" ]; then : ${OCF_ROOT=@OCF_ROOT_DIR@} fi @@ -189,12 +181,11 @@ fi } -ha_log() { - local ignore_stderr="$__ha_log_ignore_stderr_once" +__ha_log() { + local ignore_stderr=false local loglevel - # always reset this variable - __ha_log_ignore_stderr_once="" + [ "x$1" = "x--ignore-stderr" ] && ignore_stderr=true && shift [ none = "$HA_LOGFACILITY" ] && HA_LOGFACILITY="" # if we're connected to a tty, then output to stderr @@ -257,6 +248,11 @@ fi } +ha_log() +{ + __ha_log "$@" +} + ha_debug() { if [ "x${HA_debug}" = "x0" ] ; then @@ -356,24 +352,34 @@ ocf_exit_reason() { local cookie="$OCF_EXIT_REASON_PREFIX" - local fmt=$1 + local fmt local msg - if [ $# -lt 1 ]; then - ocf_log err "Not enough arguments [$#] to ocf_log_exit_msg." - fi + # No argument is likely not intentional. + # Just one argument implies a printf format string of just "%s". + # "Least surprise" in case some interpolated string from variable + # expansion or other contains a percent sign. + # More than one argument: first argument is going to be the format string. + case $# in + 0) ocf_log err "Not enough arguments to ocf_log_exit_msg." ;; + 1) fmt="%s" ;; + + *) fmt=$1 + shift + case $fmt in + *%*) : ;; # ok, does look like a format string + *) ocf_log warn "Does not look like format string: [$fmt]" ;; + esac ;; + esac + if [ -z "$cookie" ]; then # use a default prefix cookie="ocf-exit-reason:" fi - shift - msg=$(printf "${fmt}" "$@") - - printf >&2 "%s${msg}\n" "$cookie" - __ha_log_ignore_stderr_once="true" - ha_log "ERROR: $msg" + printf >&2 "%s%s\n" "$cookie" "$msg" + __ha_log --ignore-stderr "ERROR: $msg" } # -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
