Hello community,
here is the log from the commit of package yast2-tftp-server for
openSUSE:Factory checked in at 2013-05-16 11:44:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-tftp-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-tftp-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-tftp-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-tftp-server/yast2-tftp-server.changes
2013-01-08 16:48:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-tftp-server.new/yast2-tftp-server.changes
2013-05-16 11:44:32.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 13 14:46:05 UTC 2013 - mvid...@suse.com
+
+- adjust tests to changes in yast2-2.23.23 (for bnc#807507)
+- 2.22.3
+
+-------------------------------------------------------------------
Old:
----
yast2-tftp-server-2.22.2.tar.bz2
New:
----
yast2-tftp-server-2.22.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-tftp-server.spec ++++++
--- /var/tmp/diff_new_pack.czzU3H/_old 2013-05-16 11:44:32.000000000 +0200
+++ /var/tmp/diff_new_pack.czzU3H/_new 2013-05-16 11:44:32.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-tftp-server
-Version: 2.22.2
+Version: 2.22.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-tftp-server-2.22.2.tar.bz2 -> yast2-tftp-server-2.22.3.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tftp-server-2.22.2/Makefile.am
new/yast2-tftp-server-2.22.3/Makefile.am
--- old/yast2-tftp-server-2.22.2/Makefile.am 2013-01-07 11:08:24.000000000
+0100
+++ new/yast2-tftp-server-2.22.3/Makefile.am 2013-05-14 09:43:38.000000000
+0200
@@ -158,19 +158,14 @@
TAGVERSION = $(Y2TOOL) tagversion
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep
-v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l`
-gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`";
false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tftp-server-2.22.2/Makefile.am.common
new/yast2-tftp-server-2.22.3/Makefile.am.common
--- old/yast2-tftp-server-2.22.2/Makefile.am.common 2013-01-07
11:08:24.000000000 +0100
+++ new/yast2-tftp-server-2.22.3/Makefile.am.common 2013-05-14
09:43:38.000000000 +0200
@@ -31,7 +31,7 @@
CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(client_DATA)"; then \
+ @if test "$(filter %.ycp,client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
echo "Checking syntax of $${TO_CHECK}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tftp-server-2.22.2/Makefile.in
new/yast2-tftp-server-2.22.3/Makefile.in
--- old/yast2-tftp-server-2.22.2/Makefile.in 2013-01-07 11:08:26.000000000
+0100
+++ new/yast2-tftp-server-2.22.3/Makefile.in 2013-05-14 09:43:43.000000000
+0200
@@ -980,19 +980,14 @@
package: check-up-to-date check-tagversion check-textdomain package-local
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep
-v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l`
-gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`";
false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tftp-server-2.22.2/VERSION
new/yast2-tftp-server-2.22.3/VERSION
--- old/yast2-tftp-server-2.22.2/VERSION 2013-01-07 11:11:15.000000000
+0100
+++ new/yast2-tftp-server-2.22.3/VERSION 2013-05-14 09:43:31.000000000
+0200
@@ -1 +1 @@
-2.22.2
+2.22.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tftp-server-2.22.2/configure
new/yast2-tftp-server-2.22.3/configure
--- old/yast2-tftp-server-2.22.2/configure 2013-01-07 11:08:26.000000000
+0100
+++ new/yast2-tftp-server-2.22.3/configure 2013-05-14 09:43:42.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-tftp-server 2.22.1.
+# Generated by GNU Autoconf 2.69 for yast2-tftp-server 2.22.3.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-tftp-server'
PACKAGE_TARNAME='yast2-tftp-server'
-PACKAGE_VERSION='2.22.1'
-PACKAGE_STRING='yast2-tftp-server 2.22.1'
+PACKAGE_VERSION='2.22.3'
+PACKAGE_STRING='yast2-tftp-server 2.22.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1247,7 +1247,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 yast2-tftp-server 2.22.1 to adapt to many kinds of
systems.
+\`configure' configures yast2-tftp-server 2.22.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1319,7 +1319,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-tftp-server 2.22.1:";;
+ short | recursive ) echo "Configuration of yast2-tftp-server 2.22.3:";;
esac
cat <<\_ACEOF
@@ -1399,7 +1399,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-tftp-server configure 2.22.1
+yast2-tftp-server configure 2.22.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1416,7 +1416,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-tftp-server $as_me 2.22.1, which was
+It was created by yast2-tftp-server $as_me 2.22.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2355,7 +2355,7 @@
# Define the identity of the package.
PACKAGE='yast2-tftp-server'
- VERSION='2.22.1'
+ VERSION='2.22.3'
cat >>confdefs.h <<_ACEOF
@@ -2478,7 +2478,7 @@
-VERSION="2.22.1"
+VERSION="2.22.3"
RPMNAME="yast2-tftp-server"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
@@ -3404,7 +3404,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-tftp-server $as_me 2.22.1, which was
+This file was extended by yast2-tftp-server $as_me 2.22.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3457,7 +3457,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-tftp-server config.status 2.22.1
+yast2-tftp-server config.status 2.22.3
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/yast2-tftp-server-2.22.2/configure.in
new/yast2-tftp-server-2.22.3/configure.in
--- old/yast2-tftp-server-2.22.2/configure.in 2013-01-07 11:08:24.000000000
+0100
+++ new/yast2-tftp-server-2.22.3/configure.in 2013-05-14 09:43:38.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-tftp-server
dnl
-dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-tftp-server, 2.22.1, http://bugs.opensuse.org/,
yast2-tftp-server)
+AC_INIT(yast2-tftp-server, 2.22.3, http://bugs.opensuse.org/,
yast2-tftp-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.22.1"
+VERSION="2.22.3"
RPMNAME="yast2-tftp-server"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tftp-server-2.22.2/src/Makefile.in
new/yast2-tftp-server-2.22.3/src/Makefile.in
--- old/yast2-tftp-server-2.22.2/src/Makefile.in 2013-01-07
11:08:27.000000000 +0100
+++ new/yast2-tftp-server-2.22.3/src/Makefile.in 2013-05-14
09:43:43.000000000 +0200
@@ -576,7 +576,7 @@
dist-hook: check-syntax
check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(client_DATA)"; then \
+ @if test "$(filter %.ycp,client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
echo "Checking syntax of $${TO_CHECK}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-tftp-server-2.22.2/testsuite/tests/readwrite.out
new/yast2-tftp-server-2.22.3/testsuite/tests/readwrite.out
--- old/yast2-tftp-server-2.22.2/testsuite/tests/readwrite.out 2013-01-07
11:08:34.000000000 +0100
+++ new/yast2-tftp-server-2.22.3/testsuite/tests/readwrite.out 2013-05-14
09:43:31.000000000 +0200
@@ -16,8 +16,7 @@
Write .etc.xinetd_d.tftp.value.tftp.server_args "-v -s /srv/boot" true
Write .etc.xinetd_d.tftp nil true
Execute .target.mkdir "/srv/boot" 0
-Read .init.scripts.runlevel "xinetd" $["inetd":$["start":[], "stop":[]],
"network":$["start":[], "stop":[]], "networkmanager":$["start":["3", "5"],
"stop":["3", "5"]], "xinetd":$["start":["3", "5"], "stop":["3", "5"]]]
-Read .init.scripts.comment "xinetd" $["inetd":$[], "network":$[],
"networkmanager":$[], "xinetd":$[]]
+Execute .target.bash "/bin/systemctl is-enabled xinetd.service" 0
Execute .target.bash "/usr/bin/killall in.tftpd" 0
Execute .target.bash_output "/bin/systemctl restart xinetd.service"
$["TERM":"raw"] $["exit":0, "stderr":"", "stdout":"p3316\ncxinetd\n"]
Return true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-tftp-server-2.22.2/testsuite/tests/readwrite.ycp
new/yast2-tftp-server-2.22.3/testsuite/tests/readwrite.ycp
--- old/yast2-tftp-server-2.22.2/testsuite/tests/readwrite.ycp 2013-01-07
11:07:47.000000000 +0100
+++ new/yast2-tftp-server-2.22.3/testsuite/tests/readwrite.ycp 2013-05-14
09:43:31.000000000 +0200
@@ -10,35 +10,7 @@
include "testsuite.ycp";
- map service_on = $[
- "start": [ "3", "5"],
- "stop": [ "3", "5"],
- ];
- map service_off = $[
- "start": [],
- "stop": [],
- ];
-
map READ = $[
- // Runlevel:
- "init": $[
- "scripts": $[
- "exists": true,
- "runlevel": $[
- "inetd": service_off,
- "xinetd": service_on,
- "network": service_off,
- "networkmanager": service_on,
- ],
- // their contents is not important for ServiceAdjust
- "comment": $[
- "inetd": $[],
- "xinetd": $[],
- "network": $[],
- "networkmanager": $[],
- ],
- ],
- ],
"etc": $[
"xinetd_d": $[
"tftp": $[
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
