Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Thu Sep 1 14:52:12 CEST 2011.
-------- --- yast2/yast2.changes 2011-08-31 09:53:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2011-09-01 09:16:02.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 1 06:40:43 UTC 2011 - jsrain@site + +- enhanced the help command-line parameters (bnc#712271) +- 2.21.15 + +------------------------------------------------------------------- +Wed Aug 31 16:21:31 CEST 2011 - mvid...@suse.cz + +- Update Deleted and OriginalDevices in NetworkInterfaces::Write. + Thanks to Justus Winter +- 2.21.14 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.21.13.tar.bz2 New: ---- yast2-2.21.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.rmeUUM/_old 2011-09-01 14:51:44.000000000 +0200 +++ /var/tmp/diff_new_pack.rmeUUM/_new 2011-09-01 14:51:44.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2 -Version: 2.21.13 +Version: 2.21.15 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.21.13.tar.bz2 +Source0: yast2-2.21.15.tar.bz2 Prefix: /usr @@ -130,7 +130,7 @@ installation with YaST2. %prep -%setup -n yast2-2.21.13 +%setup -n yast2-2.21.15 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.21.13.tar.bz2 -> yast2-2.21.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.13/VERSION new/yast2-2.21.15/VERSION --- old/yast2-2.21.13/VERSION 2011-08-31 09:51:32.000000000 +0200 +++ new/yast2-2.21.15/VERSION 2011-09-01 09:18:31.000000000 +0200 @@ -1 +1 @@ -2.21.13 +2.21.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.13/configure new/yast2-2.21.15/configure --- old/yast2-2.21.13/configure 2011-08-31 09:52:06.000000000 +0200 +++ new/yast2-2.21.15/configure 2011-09-01 09:19:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2 2.21.13. +# Generated by GNU Autoconf 2.68 for yast2 2.21.15. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.21.13' -PACKAGE_STRING='yast2 2.21.13' +PACKAGE_VERSION='2.21.15' +PACKAGE_STRING='yast2 2.21.15' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1232,7 +1232,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.21.13 to adapt to many kinds of systems. +\`configure' configures yast2 2.21.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1303,7 +1303,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.21.13:";; + short | recursive ) echo "Configuration of yast2 2.21.15:";; esac cat <<\_ACEOF @@ -1383,7 +1383,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.21.13 +yast2 configure 2.21.15 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1400,7 +1400,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.21.13, which was +It was created by yast2 $as_me 2.21.15, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2330,7 +2330,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.21.13' + VERSION='2.21.15' cat >>confdefs.h <<_ACEOF @@ -2452,7 +2452,7 @@ -VERSION="2.21.13" +VERSION="2.21.15" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsr...@suse.cz>" @@ -3498,7 +3498,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.21.13, which was +This file was extended by yast2 $as_me 2.21.15, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3551,7 +3551,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.21.13 +yast2 config.status 2.21.15 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.13/configure.in new/yast2-2.21.15/configure.in --- old/yast2-2.21.13/configure.in 2011-08-31 09:52:04.000000000 +0200 +++ new/yast2-2.21.15/configure.in 2011-09-01 09:19:21.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.21.13, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.21.15, 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.21.13" +VERSION="2.21.15" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsr...@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.13/library/modules/Version.ycp new/yast2-2.21.15/library/modules/Version.ycp --- old/yast2-2.21.13/library/modules/Version.ycp 2011-08-31 09:52:10.000000000 +0200 +++ new/yast2-2.21.15/library/modules/Version.ycp 2011-09-01 09:19:28.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.21.13"; +global string yast2 = "2.21.15"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.13/library/network/src/NetworkInterfaces.ycp new/yast2-2.21.15/library/network/src/NetworkInterfaces.ycp --- old/yast2-2.21.13/library/network/src/NetworkInterfaces.ycp 2011-08-01 14:03:46.000000000 +0200 +++ new/yast2-2.21.15/library/network/src/NetworkInterfaces.ycp 2011-09-01 09:18:05.000000000 +0200 @@ -747,6 +747,7 @@ }); } }); + Deleted = []; /* Devices with chmod=0600 */ list<string> chmod = []; @@ -829,6 +830,14 @@ y2debug("CHANGED"); chmod = add(chmod, file); } + + if (OriginalDevices == nil) { + OriginalDevices = $[]; + } + if (OriginalDevices[typ]:nil == nil) { + OriginalDevices[typ] = $[]; + } + OriginalDevices[typ, config] = Devices[typ, config]:$[]; }); }); @@ -842,10 +851,6 @@ SCR::Execute(.target.bash, "/bin/chmod 0600 " + file); }); - // Deleted = []; - // OriginalDevices = Devices; - // Cannot do it because we have written only part of Devices. - // This module should be rewritten to objects. return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.13/library/network/testsuite/tests/NetworkInterfaces2.out new/yast2-2.21.15/library/network/testsuite/tests/NetworkInterfaces2.out --- old/yast2-2.21.13/library/network/testsuite/tests/NetworkInterfaces2.out 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.15/library/network/testsuite/tests/NetworkInterfaces2.out 2011-09-01 09:18:05.000000000 +0200 @@ -90,20 +90,6 @@ Return true Dump all=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi":$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]] Dump NetworkInterfaces::Write -Write .network.value."arc5".BOOTPROTO "dhcp" true -Write .network.value."arc5".STARTMODE "manual" true -Write .network.value."atm5".BOOTPROTO "dhcp" true -Write .network.value."atm5".STARTMODE "manual" true -Write .network.value."ci5".BOOTPROTO "dhcp" true -Write .network.value."ci5".STARTMODE "manual" true -Write .network.value."ctc5".BOOTPROTO "dhcp" true -Write .network.value."ctc5".STARTMODE "manual" true -Write .network.value."dummy5".BOOTPROTO "static" true -Write .network.value."dummy5".IPADDR "1.2.3.4/8" true -Write .network.value."dummy5".PREFIXLEN "8" true -Write .network.value."dummy5".STARTMODE "manual" true -Write .network.value."escon5".BOOTPROTO "dhcp" true -Write .network.value."escon5".STARTMODE "manual" true Write .network.value."eth5".BOOTPROTO "dhcp" true Write .network.value."eth5".STARTMODE "manual" true Write .network.value."eth6".BOOTPROTO "static" true @@ -120,14 +106,41 @@ Write .network.value."mynet0".BOOTPROTO "dhcp" true Write .network.value."mynet0".INTERFACETYPE "eth" true Write .network.value."mynet0".STARTMODE "auto" true +Write .network nil true +Return true +Write .network.value."ppp5".BOOTPROTO "dhcp" true +Write .network.value."ppp5".STARTMODE "manual" true +Write .network nil true +Return true +Write .network.value."ippp5".BOOTPROTO "dhcp" true +Write .network.value."ippp5".STARTMODE "manual" true +Write .network nil true +Return true +Return true +Write .network.value."atm5".BOOTPROTO "dhcp" true +Write .network.value."atm5".STARTMODE "manual" true +Write .network.value."tr5".BOOTPROTO "dhcp" true +Write .network.value."tr5".STARTMODE "manual" true +Write .network nil true +Return true +Write .network.value."arc5".BOOTPROTO "dhcp" true +Write .network.value."arc5".STARTMODE "manual" true +Write .network.value."ci5".BOOTPROTO "dhcp" true +Write .network.value."ci5".STARTMODE "manual" true +Write .network.value."ctc5".BOOTPROTO "dhcp" true +Write .network.value."ctc5".STARTMODE "manual" true +Write .network.value."dummy5".BOOTPROTO "static" true +Write .network.value."dummy5".IPADDR "1.2.3.4/8" true +Write .network.value."dummy5".PREFIXLEN "8" true +Write .network.value."dummy5".STARTMODE "manual" true +Write .network.value."escon5".BOOTPROTO "dhcp" true +Write .network.value."escon5".STARTMODE "manual" true Write .network.value."fddi5".BOOTPROTO "dhcp" true Write .network.value."fddi5".STARTMODE "manual" true Write .network.value."hippi5".BOOTPROTO "dhcp" true Write .network.value."hippi5".STARTMODE "manual" true Write .network.value."hsi5".BOOTPROTO "dhcp" true Write .network.value."hsi5".STARTMODE "manual" true -Write .network.value."ippp5".BOOTPROTO "dhcp" true -Write .network.value."ippp5".STARTMODE "manual" true Write .network.value."iucv5".BOOTPROTO "dhcp" true Write .network.value."iucv5".STARTMODE "manual" true Write .network.value."lo".BROADCAST "127.255.255.255" true @@ -137,10 +150,6 @@ Write .network.value."lo".STARTMODE "auto" true Write .network.value."myri5".BOOTPROTO "dhcp" true Write .network.value."myri5".STARTMODE "manual" true -Write .network.value."ppp5".BOOTPROTO "dhcp" true -Write .network.value."ppp5".STARTMODE "manual" true -Write .network.value."tr5".BOOTPROTO "dhcp" true -Write .network.value."tr5".STARTMODE "manual" true Write .network.value."eth0.3".BOOTPROTO "dhcp" true Write .network.value."eth0.3".ETHERDEVICE "eth0" true Write .network.value."eth0.3".STARTMODE "manual" true @@ -156,40 +165,6 @@ Write .network.value."vlan3".STARTMODE "manual" true Write .network nil true Return true -Write .network.value."eth5".BOOTPROTO "dhcp" true -Write .network.value."eth5".STARTMODE "manual" true -Write .network.value."eth6".BOOTPROTO "static" true -Write .network.value."eth6".IPADDR "1.2.3.4/32" true -Write .network.value."eth6".PREFIXLEN "32" true -Write .network.value."eth6".STARTMODE "manual" true -Write .network.value."eth7".STARTMODE "manual" true -Write .network.value."eth8".IPADDR "1.2.3.4/8" true -Write .network.value."eth8".PREFIXLEN "8" true -Write .network.value."eth8".STARTMODE "manual" true -Write .network.value."eth9".IPADDR "1.2.3.4/8" true -Write .network.value."eth9".PREFIXLEN "8" true -Write .network.value."eth9".STARTMODE "manual" true -Write .network.value."mynet0".BOOTPROTO "dhcp" true -Write .network.value."mynet0".INTERFACETYPE "eth" true -Write .network.value."mynet0".STARTMODE "auto" true -Write .network nil true -Return true -Write .network.value."ppp5".BOOTPROTO "dhcp" true -Write .network.value."ppp5".STARTMODE "manual" true -Write .network nil true -Return true -Write .network.value."ippp5".BOOTPROTO "dhcp" true -Write .network.value."ippp5".STARTMODE "manual" true -Write .network nil true -Return true -Write .network nil true -Return true -Write .network.value."atm5".BOOTPROTO "dhcp" true -Write .network.value."atm5".STARTMODE "manual" true -Write .network.value."tr5".BOOTPROTO "dhcp" true -Write .network.value."tr5".STARTMODE "manual" true -Write .network nil true -Return true Dump NetworkInterfaces::Export Dump exported=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi":$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]] Dump NetworkInterfaces::Import diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.13/library/network/testsuite/tests/NetworkInterfaces2.ycp new/yast2-2.21.15/library/network/testsuite/tests/NetworkInterfaces2.ycp --- old/yast2-2.21.13/library/network/testsuite/tests/NetworkInterfaces2.ycp 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-2.21.15/library/network/testsuite/tests/NetworkInterfaces2.ycp 2011-09-01 09:18:05.000000000 +0200 @@ -82,12 +82,12 @@ NetworkInterfaces::OriginalDevices = nil; DUMP("NetworkInterfaces::Write"); -TEST(``(NetworkInterfaces::Write("")), [READ], nil); TEST(``(NetworkInterfaces::Write("eth")), [READ], nil); TEST(``(NetworkInterfaces::Write("ppp")), [READ], nil); TEST(``(NetworkInterfaces::Write("ippp")), [READ], nil); TEST(``(NetworkInterfaces::Write("trx")), [READ], nil); TEST(``(NetworkInterfaces::Write("atm|tr")), [READ], nil); +TEST(``(NetworkInterfaces::Write("")), [READ], nil); map<string,map> exported = nil; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.13/scripts/yast2 new/yast2-2.21.15/scripts/yast2 --- old/yast2-2.21.13/scripts/yast2 2011-06-30 16:25:04.000000000 +0200 +++ new/yast2-2.21.15/scripts/yast2 2011-09-01 08:40:02.000000000 +0200 @@ -240,7 +240,7 @@ while true ; do case "$1" in - -h|--help) printhelp; exit 0 ;; + -h|--help) if test "$2" = '--' -a -n "$3" ; then CMDLINE_HELP="help" ; else printhelp && exit 0 ; fi ; shift ;; -l|--list) listmodules; exit 0 ;; -g|--geometry) Y2_GEOMETRY="-geometry $2"; shift 2; ;; -i|--install) Y2_INSTALL_PACKAGES=true; shift ;; @@ -275,6 +275,10 @@ # Surround all args by (...). args may contain spaces. # Use -S to avoid YCP escaping (bnc#382883) # But avoid a lone -S (cc-gnome dies, bnc#537470) + +if [ -n "$CMDLINE_HELP" ]; then + set -- $@ help; +fi if [ $# -gt 0 ]; then a=("$@") b=("${a[@]/#/(}") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org