Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2013-05-14 16:53:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2013-03-17 10:13:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-05-14 16:53:38.000000000 +0200 @@ -1,0 +2,41 @@ +Tue May 14 11:43:45 UTC 2013 - [email protected] + +- bnc#819327 + - InfiniBand device is not available on s390 arch. +- 2.23.28 + +------------------------------------------------------------------- +Tue May 14 09:17:11 CEST 2013 - [email protected] + +- accept any version of libyui +- 2.23.27 + +------------------------------------------------------------------- +Mon May 13 12:43:33 CEST 2013 - [email protected] + +- Fixing resetting steps in installation (bnc#813072) +- 2.23.26 + +------------------------------------------------------------------- +Fri May 3 17:04:22 UTC 2013 - [email protected] + +- Added functionality for checking network entry with optional + netmask in IP or CIDR format (bnc#800592). +- Using new IP::CheckNetwork in Firewall (bnc#800592). +- ValidNetwork definition moved to IP module. +- 2.23.25 + +------------------------------------------------------------------- +Thu May 2 10:32:13 UTC 2013 - [email protected] + +- Re-enabling all disabled items (steps, proposals) if stagemode + has changed (bnc#813072) +- 2.23.24 + +------------------------------------------------------------------- +Thu May 2 10:04:01 UTC 2013 - [email protected] + +- correct function signature for Pkg::CallbackErrorScanDb() + callback + +------------------------------------------------------------------- Old: ---- yast2-2.23.23.tar.bz2 New: ---- yast2-2.23.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.8P4CSb/_old 2013-05-14 16:53:39.000000000 +0200 +++ /var/tmp/diff_new_pack.8P4CSb/_new 2013-05-14 16:53:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 2.23.23 +Version: 2.23.28 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-2.23.23.tar.bz2 -> yast2-2.23.28.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/Makefile.am new/yast2-2.23.28/Makefile.am --- old/yast2-2.23.23/Makefile.am 2013-03-15 18:01:53.000000000 +0100 +++ new/yast2-2.23.28/Makefile.am 2013-05-14 14:50:33.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-2.23.23/Makefile.am.common new/yast2-2.23.28/Makefile.am.common --- old/yast2-2.23.23/Makefile.am.common 2013-03-15 18:01:53.000000000 +0100 +++ new/yast2-2.23.28/Makefile.am.common 2013-05-14 14:50:33.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-2.23.23/Makefile.in new/yast2-2.23.28/Makefile.in --- old/yast2-2.23.23/Makefile.in 2013-03-15 18:01:57.000000000 +0100 +++ new/yast2-2.23.28/Makefile.in 2013-05-14 14:50:39.000000000 +0200 @@ -983,19 +983,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-2.23.23/VERSION new/yast2-2.23.28/VERSION --- old/yast2-2.23.23/VERSION 2013-03-15 16:16:40.000000000 +0100 +++ new/yast2-2.23.28/VERSION 2013-05-14 13:56:37.000000000 +0200 @@ -1 +1 @@ -2.23.23 +2.23.28 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/configure new/yast2-2.23.28/configure --- old/yast2-2.23.23/configure 2013-03-15 18:01:57.000000000 +0100 +++ new/yast2-2.23.28/configure 2013-05-14 14:50:38.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 2.23.23. +# Generated by GNU Autoconf 2.69 for yast2 2.23.28. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.23.23' -PACKAGE_STRING='yast2 2.23.23' +PACKAGE_VERSION='2.23.28' +PACKAGE_STRING='yast2 2.23.28' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1250,7 +1250,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 2.23.23 to adapt to many kinds of systems. +\`configure' configures yast2 2.23.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1321,7 +1321,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.23.23:";; + short | recursive ) echo "Configuration of yast2 2.23.28:";; esac cat <<\_ACEOF @@ -1401,7 +1401,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.23.23 +yast2 configure 2.23.28 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1418,7 +1418,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 $as_me 2.23.23, which was +It was created by yast2 $as_me 2.23.28, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2357,7 +2357,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.23.23' + VERSION='2.23.28' cat >>confdefs.h <<_ACEOF @@ -2480,7 +2480,7 @@ -VERSION="2.23.23" +VERSION="2.23.28" RPMNAME="yast2" MAINTAINER="YaST2 Maintainers <[email protected]>" @@ -3522,7 +3522,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.23.23, which was +This file was extended by yast2 $as_me 2.23.28, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3575,7 +3575,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 config.status 2.23.23 +yast2 config.status 2.23.28 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-2.23.23/configure.in new/yast2-2.23.28/configure.in --- old/yast2-2.23.23/configure.in 2013-03-15 18:01:53.000000000 +0100 +++ new/yast2-2.23.28/configure.in 2013-05-14 14:50:33.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 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, 2.23.23, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.23.28, http://bugs.opensuse.org/, yast2) 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.23.23" +VERSION="2.23.28" RPMNAME="yast2" MAINTAINER="YaST2 Maintainers <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/data/Makefile.in new/yast2-2.23.28/data/Makefile.in --- old/yast2-2.23.23/data/Makefile.in 2013-03-15 18:01:58.000000000 +0100 +++ new/yast2-2.23.28/data/Makefile.in 2013-05-14 14:50:39.000000000 +0200 @@ -549,7 +549,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-2.23.23/library/commandline/src/Makefile.in new/yast2-2.23.28/library/commandline/src/Makefile.in --- old/yast2-2.23.23/library/commandline/src/Makefile.in 2013-03-15 18:01:58.000000000 +0100 +++ new/yast2-2.23.28/library/commandline/src/Makefile.in 2013-05-14 14:50:40.000000000 +0200 @@ -495,7 +495,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-2.23.23/library/control/src/Makefile.in new/yast2-2.23.28/library/control/src/Makefile.in --- old/yast2-2.23.23/library/control/src/Makefile.in 2013-03-15 18:01:58.000000000 +0100 +++ new/yast2-2.23.28/library/control/src/Makefile.in 2013-05-14 14:50:40.000000000 +0200 @@ -494,7 +494,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-2.23.23/library/control/src/ProductControl.ycp new/yast2-2.23.28/library/control/src/ProductControl.ycp --- old/yast2-2.23.23/library/control/src/ProductControl.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.23.28/library/control/src/ProductControl.ycp 2013-05-13 11:31:36.000000000 +0200 @@ -111,6 +111,13 @@ map <string, list<string> > DisabledSubProposals = $[]; +void ResetDisabledItems () { + DisabledModules = []; + DisabledProposals = []; + DisabledACItems = $[]; + DisabledSubProposals = $[]; +} + // <-- // Log files for hooks @@ -974,6 +981,14 @@ return; } + // bnc#813072: stagemode has changed, re-enable all disabled modules + // and proposals and other items + // function must not be called if there was no previous stage_mode + // otherwise it resets everything + if (size(last_stage_mode) > 0 && stagemode != last_stage_mode) { + ResetDisabledItems(); + } + last_stage_mode = stagemode; lastDisabledModules = DisabledModules; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/library/cron/src/Makefile.in new/yast2-2.23.28/library/cron/src/Makefile.in --- old/yast2-2.23.23/library/cron/src/Makefile.in 2013-03-15 18:01:58.000000000 +0100 +++ new/yast2-2.23.28/library/cron/src/Makefile.in 2013-05-14 14:50:40.000000000 +0200 @@ -559,7 +559,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-2.23.23/library/cwm/src/Makefile.in new/yast2-2.23.28/library/cwm/src/Makefile.in --- old/yast2-2.23.23/library/cwm/src/Makefile.in 2013-03-15 18:01:59.000000000 +0100 +++ new/yast2-2.23.28/library/cwm/src/Makefile.in 2013-05-14 14:50:41.000000000 +0200 @@ -500,7 +500,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-2.23.23/library/desktop/src/Makefile.in new/yast2-2.23.28/library/desktop/src/Makefile.in --- old/yast2-2.23.23/library/desktop/src/Makefile.in 2013-03-15 18:01:59.000000000 +0100 +++ new/yast2-2.23.28/library/desktop/src/Makefile.in 2013-05-14 14:50:41.000000000 +0200 @@ -517,7 +517,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-2.23.23/library/gpg/src/Makefile.in new/yast2-2.23.28/library/gpg/src/Makefile.in --- old/yast2-2.23.23/library/gpg/src/Makefile.in 2013-03-15 18:01:59.000000000 +0100 +++ new/yast2-2.23.28/library/gpg/src/Makefile.in 2013-05-14 14:50:41.000000000 +0200 @@ -493,7 +493,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-2.23.23/library/log/src/LogViewCore.ycp new/yast2-2.23.28/library/log/src/LogViewCore.ycp --- old/yast2-2.23.23/library/log/src/LogViewCore.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.23.28/library/log/src/LogViewCore.ycp 2013-05-09 10:07:33.000000000 +0200 @@ -29,7 +29,7 @@ * $Id: LogViewCore.ycp 45503 2008-03-17 09:46:23Z aschnell $ */ { - module "LogViewCore.ycp"; + module "LogViewCore"; textdomain "base"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/library/log/src/Makefile.in new/yast2-2.23.28/library/log/src/Makefile.in --- old/yast2-2.23.23/library/log/src/Makefile.in 2013-03-15 18:01:59.000000000 +0100 +++ new/yast2-2.23.28/library/log/src/Makefile.in 2013-05-14 14:50:41.000000000 +0200 @@ -495,7 +495,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-2.23.23/library/modules/Makefile.in new/yast2-2.23.28/library/modules/Makefile.in --- old/yast2-2.23.23/library/modules/Makefile.in 2013-03-15 18:01:59.000000000 +0100 +++ new/yast2-2.23.28/library/modules/Makefile.in 2013-05-14 14:50:41.000000000 +0200 @@ -715,7 +715,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-2.23.23/library/modules/Version.ycp new/yast2-2.23.28/library/modules/Version.ycp --- old/yast2-2.23.23/library/modules/Version.ycp 2013-03-15 18:02:03.000000000 +0100 +++ new/yast2-2.23.28/library/modules/Version.ycp 2013-05-14 14:50:45.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.23.23"; +global string yast2 = "2.23.28"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/library/network/src/Makefile.in new/yast2-2.23.28/library/network/src/Makefile.in --- old/yast2-2.23.23/library/network/src/Makefile.in 2013-03-15 18:02:00.000000000 +0100 +++ new/yast2-2.23.28/library/network/src/Makefile.in 2013-05-14 14:50:42.000000000 +0200 @@ -544,7 +544,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-2.23.23/library/network/src/NetworkInterfaces.ycp new/yast2-2.23.28/library/network/src/NetworkInterfaces.ycp --- old/yast2-2.23.23/library/network/src/NetworkInterfaces.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.23.28/library/network/src/NetworkInterfaces.ycp 2013-05-14 13:56:37.000000000 +0200 @@ -858,16 +858,43 @@ * Return supported network device types (for type netcard) * for this hardware */ -global list<string> GetDeviceTypes(){ - list<string> dev_types = ["eth", "tr", "vlan", "br", "tun", "tap", "ib", "bond"]; - if(Arch::s390 ()) dev_types = (list<string>) merge(dev_types, [ "hsi", "ctc", "escon", "ficon", "iucv", "qeth", "lcs"]); - else dev_types = (list<string>) merge(dev_types, [ "arc", "bnep", "dummy", "fddi", "myri", "usb", "wlan" ]); - if(Arch::ia64 ()) dev_types = add(dev_types, "xp"); - - foreach(string device,dev_types, { - if (!contains(splitstring(DeviceRegex["netcard"]:"", "|"), device)) y2error("%1 is not contained in DeviceRegex[\"netcard\"]", device); - }); - return dev_types; +global list<string> GetDeviceTypes() +{ + // common linux device types available on all architectures + const list<string> common_dev_types = ["eth", "tr", "vlan", "br", "tun", "tap", "bond"]; + + // s390 specific device types + const list<string> s390_dev_types = [ "hsi", "ctc", "escon", "ficon", "iucv", "qeth", "lcs"]; + + // device types which cannot be present on s390 arch + const list<string> s390_unknown_dev_types = [ "arc", "bnep", "dummy", "fddi", "myri", "usb", "wlan", "ib" ]; + + // ia64 specific device types + const list<string> ia64_dev_types = [ "xp" ]; + + list<string> dev_types = common_dev_types; + + if( Arch::s390()) + { + dev_types = (list<string>) merge( dev_types, s390_dev_types); + } + else + { + if( Arch::ia64()) + { + dev_types = (list<string>) merge( dev_types, ia64_dev_types); + } + + dev_types = (list<string>) merge( dev_types, s390_unknown_dev_types); + } + + foreach(string device, dev_types, + { + if (!contains(splitstring(DeviceRegex["netcard"]:"", "|"), device)) + y2error("%1 is not contained in DeviceRegex[\"netcard\"]", device); + }); + + return dev_types; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/library/network/src/SuSEFirewallExpertRules.ycp new/yast2-2.23.28/library/network/src/SuSEFirewallExpertRules.ycp --- old/yast2-2.23.23/library/network/src/SuSEFirewallExpertRules.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.23.28/library/network/src/SuSEFirewallExpertRules.ycp 2013-05-06 17:21:59.000000000 +0200 @@ -68,81 +68,26 @@ string type_ip4 = "[0123456789]+\.[0123456789]+\.[0123456789]+\.[0123456789]+"; /** - * Returns whether the netmask bits are valid. - * - * @return boolean whether valid - */ - boolean ValidNetmaskBits (integer netmask_bits) { - return (netmask_bits > 1 && netmask_bits <= 32); - } - - /** * Function checks the network definition used for firewall expert rules. + * For backward compatibility. Use IP::CheckNetwork() instead. * - * @example - * IsValidNetwork("192.168.0.1") -> true - * IsValidNetwork("192.168.0.355") -> false - * IsValidNetwork("192.168.0.0/24") -> true - * IsValidNetwork("192.168.0.1/32") -> true - * IsValidNetwork("192.168.0.1/0") -> false - * IsValidNetwork("192.168.0.0/255.255.0.0") -> true - * IsValidNetwork("192.168.0.0/255.255.333.0") -> false - * IsValidNetwork("192.168.0.0/255.255.224.0") -> true - * IsValidNetwork("0/0") -> true - * - * @see `man iptables` * @param string network * @return boolean if it is a valid network definition */ global boolean IsValidNetwork (string network) { - // A.B.C.D (IP) - if (regexpmatch(network, "^" + type_ip4 + "$")) { - return IP::Check4(network); - } - - // A.B.C.D/1 - A.B.C.D/32 (IP with a numeric netmask) - else if (regexpmatch(network, "^" + type_ip4 + "/[01234567890]+$")) { - string part_ip = regexpsub (network, "^(" + type_ip4 + ")/[01234567890]+$", "\\1"); - string part_bits = regexpsub (network, "^" + type_ip4 + "/([01234567890]+)$", "\\1"); - - return (IP::Check4(part_ip) && ValidNetmaskBits(tointeger(part_bits))); - } - - // 0/0 (all) - else if (network == "0/0") { - return true; - } - - // A.B.C.D/E.F.G.H (IP with Netmask) - else if (regexpmatch(network, "^" + type_ip4 + "/" + type_ip4 + "$")) { - string part_ip = regexpsub (network, "^(" + type_ip4 + ")/" + type_ip4 + "$", "\\1"); - string part_netmask = regexpsub (network, "^" + type_ip4 + "/(" + type_ip4 + ")$", "\\1"); - - return (IP::Check4(part_ip) && Netmask::Check4(part_netmask)); - } - - // The rest - else { - y2warning("Unknown network type: %1", network); - return false; - } + y2internal("Deprecated, please use IP::CheckNetwork() instead"); + return IP::CheckNetwork(network); } - + /** * Returns string of valid network definition. + * Deprecated, please, use IP::ValidNetwork() instead. * * @return string describing the valid network. */ global string ValidNetwork () { - // TRANSLATORS: description of the valid network definition - return _("A valid network definition can contain the IP, -IP/Netmask, IP/Netmask_Bits, or 0/0 for all networks. - -Examples: -IP: 192.168.0.1 -IP/Netmask: 192.168.0.0/255.255.255.0 -IP/Netmask_Bits: 192.168.0.0/24 or 192.168.0.1/32 -"); + y2internal("Deprecated, please, use IP::ValidNetwork() instead"); + return IP::ValidNetwork(); } /** @@ -177,7 +122,7 @@ * Port can be port number, port name, port range. Protocol can be 'tcp', 'udp', * 'icmp', 'all' or '_rpc_' (dport is then a RPC service name, e.g., ypbind). * - * @see IsValidNetwork() + * @see IP::CheckNetwork() * * @struct This might return, e.g., [ * // All requests from 80.44.11.22 to TCP port 22 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/library/network/testsuite/tests/SuSEFirewallExpertRules.out new/yast2-2.23.28/library/network/testsuite/tests/SuSEFirewallExpertRules.out --- old/yast2-2.23.23/library/network/testsuite/tests/SuSEFirewallExpertRules.out 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.23.28/library/network/testsuite/tests/SuSEFirewallExpertRules.out 2013-05-06 16:16:35.000000000 +0200 @@ -7,11 +7,11 @@ Return true Return true Return true +Return true Dump All these should be *invalid* (false): Return false Return false Return false -Return false Return false Dump Testing adding/reading expert rules Return [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp new/yast2-2.23.28/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp --- old/yast2-2.23.23/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.23.28/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp 2013-05-06 16:16:35.000000000 +0200 @@ -30,11 +30,11 @@ list <string> valid_network_definitions = [ "192.168.0.1", "192.168.0.0/24", "192.168.0.1/32", "192.168.0.0/255.255.0.0", - "192.168.0.0/255.255.224.0", "0/0", "192.168.0.1/16", + "192.168.0.0/255.255.224.0", "0/0", "192.168.0.1/16", "192.168.0.1/0" ]; list <string> invalid_network_definitions = [ - "192.168.0.355", "192.168.0.1/0", "192.168.0.0/255.255.333.0", + "192.168.0.355", "192.168.0.0/255.255.333.0", "192.168.0.1/888", "192.168.0.1/33", ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/library/packages/src/Makefile.in new/yast2-2.23.28/library/packages/src/Makefile.in --- old/yast2-2.23.23/library/packages/src/Makefile.in 2013-03-15 18:02:00.000000000 +0100 +++ new/yast2-2.23.28/library/packages/src/Makefile.in 2013-05-14 14:50:42.000000000 +0200 @@ -523,7 +523,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-2.23.23/library/packages/src/PackageCallbacks.ycp new/yast2-2.23.28/library/packages/src/PackageCallbacks.ycp --- old/yast2-2.23.23/library/packages/src/PackageCallbacks.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.23.28/library/packages/src/PackageCallbacks.ycp 2013-05-02 12:21:35.000000000 +0200 @@ -2999,6 +2999,8 @@ void DummyVoidStringInteger(string param1, integer param2) {y2debug("Empty generic void(string, integer) callback");} +string DummyStringIntegerString(integer param1, string param2) {y2debug("Empty generic string(integer, string) callback"); return "";} + global void SetDummyPatchCallbacks() { Pkg::CallbackStartDeltaDownload (DummyVoidStringInteger); @@ -3074,7 +3076,7 @@ { Pkg::CallbackStartScanDb (DummyVoid); Pkg::CallbackProgressScanDb (DummyBooleanInteger); - Pkg::CallbackErrorScanDb (DummyVoidIntegerString); + Pkg::CallbackErrorScanDb (DummyStringIntegerString); Pkg::CallbackDoneScanDb (DummyVoidIntegerString); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/library/runlevel/src/Makefile.in new/yast2-2.23.28/library/runlevel/src/Makefile.in --- old/yast2-2.23.23/library/runlevel/src/Makefile.in 2013-03-15 18:02:00.000000000 +0100 +++ new/yast2-2.23.28/library/runlevel/src/Makefile.in 2013-05-14 14:50:42.000000000 +0200 @@ -558,7 +558,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-2.23.23/library/sequencer/src/Makefile.in new/yast2-2.23.28/library/sequencer/src/Makefile.in --- old/yast2-2.23.23/library/sequencer/src/Makefile.in 2013-03-15 18:02:00.000000000 +0100 +++ new/yast2-2.23.28/library/sequencer/src/Makefile.in 2013-05-14 14:50:42.000000000 +0200 @@ -520,7 +520,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-2.23.23/library/system/src/Makefile.in new/yast2-2.23.28/library/system/src/Makefile.in --- old/yast2-2.23.23/library/system/src/Makefile.in 2013-03-15 18:02:01.000000000 +0100 +++ new/yast2-2.23.28/library/system/src/Makefile.in 2013-05-14 14:50:43.000000000 +0200 @@ -566,7 +566,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-2.23.23/library/types/src/IP.ycp new/yast2-2.23.28/library/types/src/IP.ycp --- old/yast2-2.23.23/library/types/src/IP.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.23.28/library/types/src/IP.ycp 2013-05-06 17:21:59.000000000 +0200 @@ -34,6 +34,8 @@ module "IP"; textdomain "base"; +import "Netmask"; + global string ValidChars = "0123456789abcdefABCDEF.:"; global string ValidChars4 = "0123456789."; global string ValidChars6 = "0123456789abcdefABCDEF:"; @@ -145,6 +147,23 @@ return Check4(ip) || Check6(ip); } +/** + * Returns string of valid network definition. + * Both IPv4 and IPv6. + * + * @return string describing the valid network. + */ +global string ValidNetwork () { + // TRANSLATORS: description of the valid network definition + return _("A valid network definition can contain the IP, +IP/Netmask, IP/Netmask_Bits, or 0/0 for all networks. + +Examples: +IP: 192.168.0.1 or 2001:db8:0::1 +IP/Netmask: 192.168.0.0/255.255.255.0 or 2001:db8:0::1/56 +IP/Netmask_Bits: 192.168.0.0/24 or 192.168.0.1/32 or 2001:db8:0::1/ffff::0 +"); +} /** * Convert IPv4 address from string to integer @@ -287,5 +306,109 @@ return ipv4; } +boolean CheckNetworkShared(string network) { + if (network == nil || network == "") { + return false; + + // all networks + } else if (network == "0/0") { + return true; + } + + return nil; +} + +/** + * Checks the given IPv4 network entry. + * + * @see CheckNetwork for details. + * @see CheckNetwork6 for IPv6 version of the same function. + * + * @example + * CheckNetwork("192.168.0.0/255.255.255.0") -> true + * CheckNetwork("192.168.1.22") -> true + * CheckNetwork("172.55.0.0/33") -> false + */ +global boolean CheckNetwork4(string network) { + boolean generic_check = CheckNetworkShared(network); + if (generic_check != nil) { + return generic_check; + + // 192.168.0.1, 0.8.55.999 + } else if (Check4(network)) { + return true; + + // 192.168.0.0/20, 0.8.55/158 + } else if (regexpmatch(network, "^[" + IP::ValidChars4 + "]+/[0-9]+$")) { + list <string> net_parts = splitstring(network, "/"); + return (Check4 (net_parts[0]:"") && Netmask::CheckPrefix4 (net_parts[1]:"")); + + // 192.168.0.0/255.255.255.0, 0.8.55/10.258.12 + } else if (regexpmatch(network, "^[" + ValidChars4 + "]+/[" + ValidChars4 + "]+$")) { + list <string> net_parts = splitstring(network, "/"); + return (IP::Check4 (net_parts[0]:"") && Netmask::Check4 (net_parts[1]:"")); + } + + return false; +} + +/** + * Checks the given IPv6 network entry. + * + * @see CheckNetwork for details. + * @see CheckNetwork4 for IPv4 version of the same function. + * + * @example + * CheckNetwork("2001:db8:0::1/64") -> true + * CheckNetwork("2001:db8:0::1") -> true + * CheckNetwork("::1/257") -> false + */ +global boolean CheckNetwork6(string network) { + boolean generic_check = CheckNetworkShared(network); + if (generic_check != nil) { + return generic_check; + + // 2001:db8:0::1 + } else if (IP::Check6(network)) { + return true; + + // 2001:db8:0::1/64 + } else if (regexpmatch(network, "^[" + IP::ValidChars6 + "]+/[" + Netmask::ValidChars6 + "]+$")) { + list <string> net_parts = splitstring(network, "/"); + return (IP::Check6 (net_parts[0]:"") && Netmask::Check6 (net_parts[1]:"")); + + // 2001:db8:0::1/ffff:ffff::0 + } else if (regexpmatch(network, "^[" + IP::ValidChars6 + "]+/[" + IP::ValidChars6 + "]+$")) { + list <string> net_parts = splitstring(network, "/"); + return (IP::Check6 (net_parts[0]:"") && IP::Check6 (net_parts[1]:"")); + } + + return false; +} + +/** + * Checks the given network entry which can be defined in several formats: + * - Single IPv4 or IPv6, e.g., 192.168.0.1 or 2001:db8:0::1 + * - IP/Netmask, e.g., 192.168.0.0/255.255.255.0 or 2001:db8:0::1/ffff:ffff::0 + * - IP/CIDR, e.g., 192.168.0.0/20 or 2001:db8:0::1/56 + * + * @example + * CheckNetwork("192.168.0.1") -> true + * CheckNetwork("192.168.0.0/20") -> true + * CheckNetwork("192.168.0.0/255.255.255.0") -> true + * CheckNetwork("0/0") -> true + * CheckNetwork("::1/128") -> true + * CheckNetwork("2001:db8:0::1") -> true + * CheckNetwork("2001:db8:0::1/64") -> true + * CheckNetwork("2001:db8:0::1/ffff:ffff::0") -> true + * CheckNetwork("2001:db8:0::xyz") -> false + * CheckNetwork("::1/257") -> false + * CheckNetwork("172.55.0.0/33") -> false + * CheckNetwork("172.55.0.0/125.85.5.5") -> false + */ +global boolean CheckNetwork(string network) { + return CheckNetwork4(network) || CheckNetwork6(network); +} + /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/library/types/src/Makefile.in new/yast2-2.23.28/library/types/src/Makefile.in --- old/yast2-2.23.23/library/types/src/Makefile.in 2013-03-15 18:02:01.000000000 +0100 +++ new/yast2-2.23.28/library/types/src/Makefile.in 2013-05-14 14:50:43.000000000 +0200 @@ -490,7 +490,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-2.23.23/library/types/testsuite/tests/IP.out new/yast2-2.23.28/library/types/testsuite/tests/IP.out --- old/yast2-2.23.23/library/types/testsuite/tests/IP.out 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.23.28/library/types/testsuite/tests/IP.out 2013-05-03 18:26:36.000000000 +0200 @@ -75,3 +75,48 @@ Return 127.255.255.255 Return 192.168.110.255 Return 10.20.15.255 +Dump IP::CheckNetwork4 -> true +Return true +Return true +Return true +Return true +Return true +Return true +Return true +Return true +Return true +Return true +Dump IP::CheckNetwork4 -> false +Return false +Return false +Return false +Return false +Return false +Return false +Dump IP::CheckNetwork6 -> true +Return true +Return true +Return true +Return true +Return true +Return true +Return true +Return true +Return true +Dump IP::CheckNetwork6 -> false +Return false +Return false +Return false +Return false +Return false +Return false +Dump IP::CheckNetwork -> true +Return true +Return true +Return true +Return true +Dump IP::CheckNetwork -> false +Return false +Return false +Return false +Return false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/library/types/testsuite/tests/IP.ycp new/yast2-2.23.28/library/types/testsuite/tests/IP.ycp --- old/yast2-2.23.23/library/types/testsuite/tests/IP.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.23.28/library/types/testsuite/tests/IP.ycp 2013-05-03 18:26:36.000000000 +0200 @@ -114,4 +114,55 @@ TEST(``(IP::ComputeBroadcast("192.168.110.23","255.255.255.0")), [], nil); TEST(``(IP::ComputeBroadcast("10.20.1.29","255.255.240.0")), [], nil); +DUMP("IP::CheckNetwork4 -> true"); +TEST(``(IP::CheckNetwork4("192.168.0.1")), [], nil); +TEST(``(IP::CheckNetwork4("192.168.0.255")), [], nil); +TEST(``(IP::CheckNetwork4("192.168.0.1/20")), [], nil); +TEST(``(IP::CheckNetwork4("192.168.0.255/32")), [], nil); +TEST(``(IP::CheckNetwork4("192.168.0.1/255.240.0.0")), [], nil); +TEST(``(IP::CheckNetwork4("192.168.0.255/255.255.255.255")), [], nil); +TEST(``(IP::CheckNetwork4("192.168.0.1/0")), [], nil); +TEST(``(IP::CheckNetwork4("172.55.0.0/1")), [], nil); +TEST(``(IP::CheckNetwork4("0/0")), [], nil); +TEST(``(IP::CheckNetwork4("255.255.255.255/255.255.255.255")), [], nil); + +DUMP("IP::CheckNetwork4 -> false"); +TEST(``(IP::CheckNetwork4("")), [], nil); +TEST(``(IP::CheckNetwork4("172.55.0.0/33")), [], nil); +TEST(``(IP::CheckNetwork4("256.168.0.255")), [], nil); +TEST(``(IP::CheckNetwork4("172.55.0.0/125.85.5.5")), [], nil); +TEST(``(IP::CheckNetwork4("192.168.0.255/5.5.5")), [], nil); +TEST(``(IP::CheckNetwork4("192.168.0.255/255.255.0.255")), [], nil); + +DUMP("IP::CheckNetwork6 -> true"); +TEST(``(IP::CheckNetwork6("FE80:0000:0000:0000:0202:B3FF:FE1E:8329")), [], nil); +TEST(``(IP::CheckNetwork6("2001:db8:0::1")), [], nil); +TEST(``(IP::CheckNetwork6("2000::/3")), [], nil); +TEST(``(IP::CheckNetwork6("2001:db8:0::1/56")), [], nil); +TEST(``(IP::CheckNetwork6("2001:db8:0::1/64")), [], nil); +TEST(``(IP::CheckNetwork6("2001:db8:0::1/ffff::0")), [], nil); +TEST(``(IP::CheckNetwork6("2001:db8:0::1/ffff:ffff::0")), [], nil); +TEST(``(IP::CheckNetwork6("::1/128")), [], nil); +TEST(``(IP::CheckNetwork6("0/0")), [], nil); + +DUMP("IP::CheckNetwork6 -> false"); +TEST(``(IP::CheckNetwork6("")), [], nil); +TEST(``(IP::CheckNetwork6("FE80:0000:0000:0000:0202:B3FF:FE1E:8329:0000")), [], nil); +TEST(``(IP::CheckNetwork6("2001:db8:0::xyz")), [], nil); +TEST(``(IP::CheckNetwork6("::1/257")), [], nil); +TEST(``(IP::CheckNetwork6("::1/")), [], nil); +TEST(``(IP::CheckNetwork6("2001:db8:0::1/ffff:xyz::0")), [], nil); + +DUMP("IP::CheckNetwork -> true"); +TEST(``(IP::CheckNetwork("192.168.0.1")), [], nil); +TEST(``(IP::CheckNetwork("172.55.0.0/1")), [], nil); +TEST(``(IP::CheckNetwork("2001:db8:0::1")), [], nil); +TEST(``(IP::CheckNetwork("2001:db8:0::1/ffff::0")), [], nil); + +DUMP("IP::CheckNetwork -> false"); +TEST(``(IP::CheckNetwork("256.168.0.255")), [], nil); +TEST(``(IP::CheckNetwork("192.168.0.255/5.5.5")), [], nil); +TEST(``(IP::CheckNetwork("2001:db8:0::xyz")), [], nil); +TEST(``(IP::CheckNetwork("2001:db8:0::1/ffff:xyz::0")), [], nil); + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.23/library/wizard/src/Makefile.in new/yast2-2.23.28/library/wizard/src/Makefile.in --- old/yast2-2.23.23/library/wizard/src/Makefile.in 2013-03-15 18:02:01.000000000 +0100 +++ new/yast2-2.23.28/library/wizard/src/Makefile.in 2013-05-14 14:50:43.000000000 +0200 @@ -498,7 +498,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-2.23.23/library/xml/src/Makefile.in new/yast2-2.23.28/library/xml/src/Makefile.in --- old/yast2-2.23.23/library/xml/src/Makefile.in 2013-03-15 18:02:01.000000000 +0100 +++ new/yast2-2.23.28/library/xml/src/Makefile.in 2013-05-14 14:50:43.000000000 +0200 @@ -494,7 +494,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-2.23.23/remote/Makefile.in new/yast2-2.23.28/remote/Makefile.in --- old/yast2-2.23.23/remote/Makefile.in 2013-03-15 18:02:01.000000000 +0100 +++ new/yast2-2.23.28/remote/Makefile.in 2013-05-14 14:50:43.000000000 +0200 @@ -526,7 +526,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-2.23.23/scripts/yast2-funcs new/yast2-2.23.28/scripts/yast2-funcs --- old/yast2-2.23.23/scripts/yast2-funcs 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.23.28/scripts/yast2-funcs 2013-05-13 17:31:39.000000000 +0200 @@ -53,12 +53,11 @@ function check_libyui_plugin() { - if [ -e "/usr/lib64/yui/libyui-${1}.so.4" -o -e "/usr/lib/yui/libyui-${1}.so.4" ]; then - return 0 # success - fi - - return 1 # failure + # look for libyui plugins in lib and lib64, accept all so versions + # return 0 if libyui plugin exists + ls /usr/lib*/yui/libyui-${1}.so.* 2> /dev/null | grep -q . + return $? } # -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
