Hello community,
here is the log from the commit of package transactional-update for
openSUSE:Factory checked in at 2017-10-30 21:18:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/transactional-update (Old)
and /work/SRC/openSUSE:Factory/.transactional-update.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "transactional-update"
Mon Oct 30 21:18:26 2017 rev:14 rq:537066 version:1.21
Changes:
--------
---
/work/SRC/openSUSE:Factory/transactional-update/transactional-update.changes
2017-09-13 22:38:05.026153774 +0200
+++
/work/SRC/openSUSE:Factory/.transactional-update.new/transactional-update.changes
2017-10-30 21:18:24.755354750 +0100
@@ -1,0 +2,6 @@
+Fri Oct 27 13:52:56 CEST 2017 - ku...@suse.de
+
+- Update to version 1.21
+ - Reset salt grains even if no update was found
+
+-------------------------------------------------------------------
Old:
----
transactional-update-1.20.tar.bz2
New:
----
transactional-update-1.21.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ transactional-update.spec ++++++
--- /var/tmp/diff_new_pack.U8zpDY/_old 2017-10-30 21:18:25.551325809 +0100
+++ /var/tmp/diff_new_pack.U8zpDY/_new 2017-10-30 21:18:25.555325664 +0100
@@ -17,7 +17,7 @@
Name: transactional-update
-Version: 1.20
+Version: 1.21
Release: 0
Summary: Transactional Updates with btrfs and snapshots
License: GPL-2.0+
++++++ transactional-update-1.20.tar.bz2 -> transactional-update-1.21.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.20/NEWS
new/transactional-update-1.21/NEWS
--- old/transactional-update-1.20/NEWS 2017-09-13 11:21:31.000000000 +0200
+++ new/transactional-update-1.21/NEWS 2017-10-27 13:51:13.000000000 +0200
@@ -2,6 +2,9 @@
Copyright (C) 2016, 2017 Thorsten Kukuk
+Version 1.21
+* Reset salt grains if no updates are available
+
Version 1.20
* Document more options
* Add pkg update option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.20/configure
new/transactional-update-1.21/configure
--- old/transactional-update-1.20/configure 2017-09-13 11:20:46.000000000
+0200
+++ new/transactional-update-1.21/configure 2017-10-27 13:51:19.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for transactional-update 1.20.
+# Generated by GNU Autoconf 2.69 for transactional-update 1.21.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@
# Identity of this package.
PACKAGE_NAME='transactional-update'
PACKAGE_TARNAME='transactional-update'
-PACKAGE_VERSION='1.20'
-PACKAGE_STRING='transactional-update 1.20'
+PACKAGE_VERSION='1.21'
+PACKAGE_STRING='transactional-update 1.21'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1211,7 +1211,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures transactional-update 1.20 to adapt to many kinds of
systems.
+\`configure' configures transactional-update 1.21 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1278,7 +1278,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of transactional-update 1.20:";;
+ short | recursive ) echo "Configuration of transactional-update 1.21:";;
esac
cat <<\_ACEOF
@@ -1358,7 +1358,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-transactional-update configure 1.20
+transactional-update configure 1.21
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1375,7 +1375,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by transactional-update $as_me 1.20, which was
+It was created by transactional-update $as_me 1.21, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2238,7 +2238,7 @@
# Define the identity of the package.
PACKAGE='transactional-update'
- VERSION='1.20'
+ VERSION='1.21'
cat >>confdefs.h <<_ACEOF
@@ -3097,7 +3097,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by transactional-update $as_me 1.20, which was
+This file was extended by transactional-update $as_me 1.21, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3150,7 +3150,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-transactional-update config.status 1.20
+transactional-update config.status 1.21
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.20/configure.ac
new/transactional-update-1.21/configure.ac
--- old/transactional-update-1.20/configure.ac 2017-09-13 11:20:38.000000000
+0200
+++ new/transactional-update-1.21/configure.ac 2017-10-27 13:50:14.000000000
+0200
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(transactional-update, 1.20)
+AC_INIT(transactional-update, 1.21)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([sbin/transactional-update.in])
AC_PREFIX_DEFAULT(/usr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.20/logrotate/Makefile.in
new/transactional-update-1.21/logrotate/Makefile.in
--- old/transactional-update-1.20/logrotate/Makefile.in 2017-09-13
11:20:44.000000000 +0200
+++ new/transactional-update-1.21/logrotate/Makefile.in 2017-10-27
13:51:19.000000000 +0200
@@ -238,9 +238,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu logrotate/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign logrotate/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu logrotate/Makefile
+ $(AUTOMAKE) --foreign logrotate/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.20/man/Makefile.in
new/transactional-update-1.21/man/Makefile.in
--- old/transactional-update-1.20/man/Makefile.in 2017-09-13
11:20:44.000000000 +0200
+++ new/transactional-update-1.21/man/Makefile.in 2017-10-27
13:51:19.000000000 +0200
@@ -261,9 +261,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu man/Makefile
+ $(AUTOMAKE) --foreign man/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.20/sbin/Makefile.in
new/transactional-update-1.21/sbin/Makefile.in
--- old/transactional-update-1.20/sbin/Makefile.in 2017-09-13
11:20:44.000000000 +0200
+++ new/transactional-update-1.21/sbin/Makefile.in 2017-10-27
13:51:19.000000000 +0200
@@ -238,9 +238,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sbin/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign sbin/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu sbin/Makefile
+ $(AUTOMAKE) --foreign sbin/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/transactional-update-1.20/sbin/transactional-update.in
new/transactional-update-1.21/sbin/transactional-update.in
--- old/transactional-update-1.20/sbin/transactional-update.in 2017-09-01
10:24:09.000000000 +0200
+++ new/transactional-update-1.21/sbin/transactional-update.in 2017-10-27
13:41:59.000000000 +0200
@@ -394,6 +394,14 @@
if [ ${PACKAGE_UPDATES} -eq 0 -a ${SIZE_OF_UPDATES} -eq 0 ]; then
log_info "zypper: nothing to update"
log_info "transactional-update finished"
+ if [ $USE_SALT_GRAINS -eq 1 ]; then
+ log_info "Update salt grains"
+ if [ -f /etc/salt/grains ]; then
+ # Reset tx_update_failed if exist. Could have been set due
to wrong
+ # repository configuration or other temporary error before.
+ sed -i -e 's|tx_update_failed:.*|tx_update_failed: false|g'
/etc/salt/grains
+ fi
+ fi
exit 0
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.20/systemd/Makefile.in
new/transactional-update-1.21/systemd/Makefile.in
--- old/transactional-update-1.20/systemd/Makefile.in 2017-09-13
11:20:44.000000000 +0200
+++ new/transactional-update-1.21/systemd/Makefile.in 2017-10-27
13:51:19.000000000 +0200
@@ -238,9 +238,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu systemd/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign systemd/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu systemd/Makefile
+ $(AUTOMAKE) --foreign systemd/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
