Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Thu Feb 26 12:24:47 CET 2009. -------- --- yast2/yast2.changes 2009-02-16 10:58:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2009-02-24 18:32:15.000000000 +0100 @@ -1,0 +2,31 @@ +Tue Feb 24 18:24:42 CET 2009 - mzugec@suse.cz + +- - NetworkInterfaces - possible to not use LABEL for aliases +(bnc#471253) +- 2.18.12 + +------------------------------------------------------------------- +Tue Feb 24 14:34:50 CET 2009 - locilka@suse.cz + +- Added support for `reboot_same_step return value (bnc #475650). +- 2.18.11 + +------------------------------------------------------------------- +Mon Feb 23 12:43:46 CET 2009 - locilka@suse.cz + +- Fixing ProductControl to avoid leaving a workflow with the `auto + result - reruns the very first dialog (bnc #468677). + +------------------------------------------------------------------- +Wed Feb 18 18:05:49 CET 2009 - mzugec@suse.cz + +- NetworkInterfaces.GetDeviceTypes-added bond for s390 (bnc#476490) +- 2.18.10 + +------------------------------------------------------------------- +Wed Feb 18 15:37:29 CET 2009 - jsrain@suse.cz + +- use PAE kernel only if there is >3GB of RAM or NX flag is present + (bnc#467328) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.18.9.tar.bz2 New: ---- yast2-2.18.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.nC4828/_old 2009-02-26 12:24:19.000000000 +0100 +++ /var/tmp/diff_new_pack.nC4828/_new 2009-02-26 12:24:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.18.9) +# spec file for package yast2 (Version 2.18.12) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2 -Version: 2.18.9 +Version: 2.18.12 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.18.9.tar.bz2 +Source0: yast2-2.18.12.tar.bz2 Prefix: /usr Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite @@ -147,7 +147,7 @@ Steffen Winterfeldt <snwint@suse.de> %prep -%setup -n yast2-2.18.9 +%setup -n yast2-2.18.12 %build %{prefix}/bin/y2tool y2autoconf @@ -251,6 +251,22 @@ %doc %{prefix}/share/doc/packages/yast2/types %doc %{prefix}/share/doc/packages/yast2/wizard %changelog +* Tue Feb 24 2009 mzugec@suse.cz +- - NetworkInterfaces - possible to not use LABEL for aliases + (bnc#471253) +- 2.18.12 +* Tue Feb 24 2009 locilka@suse.cz +- Added support for `reboot_same_step return value (bnc #475650). +- 2.18.11 +* Mon Feb 23 2009 locilka@suse.cz +- Fixing ProductControl to avoid leaving a workflow with the `auto + result - reruns the very first dialog (bnc #468677). +* Wed Feb 18 2009 mzugec@suse.cz +- NetworkInterfaces.GetDeviceTypes-added bond for s390 (bnc#476490) +- 2.18.10 +* Wed Feb 18 2009 jsrain@suse.cz +- use PAE kernel only if there is >3GB of RAM or NX flag is present + (bnc#467328) * Mon Feb 16 2009 mzugec@suse.cz - assign to GetInstArgs.args first map, not first argument (bnc#475169) - 2.18.9 ++++++ yast2-2.18.9.tar.bz2 -> yast2-2.18.12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.9/configure new/yast2-2.18.12/configure --- old/yast2-2.18.9/configure 2009-02-16 10:42:23.000000000 +0100 +++ new/yast2-2.18.12/configure 2009-02-24 18:13:37.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2 2.18.8. +# Generated by GNU Autoconf 2.63 for yast2 2.18.10. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.18.8' -PACKAGE_STRING='yast2 2.18.8' +PACKAGE_VERSION='2.18.10' +PACKAGE_STRING='yast2 2.18.10' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1277,7 +1277,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.18.8 to adapt to many kinds of systems. +\`configure' configures yast2 2.18.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1348,7 +1348,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.18.8:";; + short | recursive ) echo "Configuration of yast2 2.18.10:";; esac cat <<\_ACEOF @@ -1428,7 +1428,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.18.8 +yast2 configure 2.18.10 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1442,7 +1442,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.18.8, which was +It was created by yast2 $as_me 2.18.10, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2289,7 +2289,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.18.8' + VERSION='2.18.10' cat >>confdefs.h <<_ACEOF @@ -2513,7 +2513,7 @@ -VERSION="2.18.8" +VERSION="2.18.10" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" @@ -3574,7 +3574,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.18.8, which was +This file was extended by yast2 $as_me 2.18.10, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3624,7 +3624,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2 config.status 2.18.8 +yast2 config.status 2.18.10 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.9/configure.in new/yast2-2.18.12/configure.in --- old/yast2-2.18.9/configure.in 2009-02-16 10:42:17.000000000 +0100 +++ new/yast2-2.18.12/configure.in 2009-02-24 18:13:22.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.18.8, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.18.10, 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.18.8" +VERSION="2.18.10" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.9/library/control/src/GetInstArgs.ycp new/yast2-2.18.12/library/control/src/GetInstArgs.ycp --- old/yast2-2.18.9/library/control/src/GetInstArgs.ycp 2009-02-16 10:52:32.000000000 +0100 +++ new/yast2-2.18.12/library/control/src/GetInstArgs.ycp 2009-02-24 18:24:12.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Get client arguments * Authors: Anas Nashif <nashif@suse.de> * - * $Id: GetInstArgs.ycp 55521 2009-02-16 09:52:30Z mzugec $ + * $Id: GetInstArgs.ycp 55716 2009-02-24 13:31:10Z locilka $ */ @@ -29,7 +29,8 @@ /* Check arguments */ args = $[]; integer i=0; - // assign to args first available map (in 2nd stage, first argument is string - bnc#475169) + // assign to args first available map + // (in proposals, first argument is string - bnc#475169) while(i<size(WFM::Args())){ if(is(WFM::Args(i), map)){ args=(map)WFM::Args(i); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.9/library/control/src/ProductControl.ycp new/yast2-2.18.12/library/control/src/ProductControl.ycp --- old/yast2-2.18.9/library/control/src/ProductControl.ycp 2009-01-26 14:04:36.000000000 +0100 +++ new/yast2-2.18.12/library/control/src/ProductControl.ycp 2009-02-24 18:24:12.000000000 +0100 @@ -7,7 +7,7 @@ * Jiri Srain <jsrain@suse.cz> * Lukas Ocilka <locilka@suse.cz> * - * $Id: ProductControl.ycp 54996 2009-01-26 12:13:51Z locilka $ + * $Id: ProductControl.ycp 55727 2009-02-24 15:04:05Z locilka $ */ { textdomain "base"; @@ -1384,8 +1384,14 @@ // BNC #468677 // The very first dialog must not exit with `back - if (result == `back && current_step == 0) { + // or `auto + if ( + current_step == 0 + && + (result == `back || (result == `auto && former_result == `back)) + ) { y2warning ("Returned %1, Current step %2 (%3). The current step will be called again...", result, current_step, step_name); + former_result = `next; result = `again; } @@ -1416,17 +1422,8 @@ { continue; // Show same dialog again } - else if (result == `restart_yast) - { - final_result = result; - break; - } - else if (result == `restart_same_step) - { - final_result = result; - break; - } - else if (result == `reboot) + // BNC #475650: Adding `reboot_same_step + else if (result == `restart_yast || result == `restart_same_step || result == `reboot || result == `reboot_same_step) { final_result = result; break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.9/library/modules/Version.ycp new/yast2-2.18.12/library/modules/Version.ycp --- old/yast2-2.18.9/library/modules/Version.ycp 2009-02-16 10:52:46.000000000 +0100 +++ new/yast2-2.18.12/library/modules/Version.ycp 2009-02-24 18:25:22.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.18.9"; +global string yast2 = "2.18.12"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.9/library/network/src/NetworkInterfaces.ycp new/yast2-2.18.12/library/network/src/NetworkInterfaces.ycp --- old/yast2-2.18.9/library/network/src/NetworkInterfaces.ycp 2008-09-15 13:18:03.000000000 +0200 +++ new/yast2-2.18.12/library/network/src/NetworkInterfaces.ycp 2009-02-24 18:12:21.000000000 +0100 @@ -698,7 +698,7 @@ path base = add (.network.value, dev); // look in OriginalDevs because we need to catch all variables // of the alias - foreach (string key, any dummy, OriginalDevs[typ, num, "_aliases", anum]:$[], { + foreach (string key, any dummy, OriginalDevs[typ, dev, "_aliases", anum]:$[], { path p = add (base, key + "_" + anum); y2debug ("deleting: %1", p); SCR::Write (p, nil); @@ -739,7 +739,7 @@ // writing, but we create it in 2 ways so it's // better here. Actually it does not work because // the edit dialog nukes LABEL :-( - boolean seen_label = false; +// boolean seen_label = false; if (size(amap["IPADDR"]:"")>0 && size(amap["NETMASK"]:"")>0){ amap["IPADDR"] = sformat("%1/%2", amap["IPADDR"]:"", Netmask::ToBits(amap["NETMASK"]:"")); amap=remove(amap, "NETMASK"); @@ -755,13 +755,14 @@ maplist(string ak, string av, amap, { string akk = ak + "_" + anum; ShellSafeWrite (topath (p + akk), av); - seen_label = seen_label || ak == "LABEL"; +// seen_label = seen_label || ak == "LABEL"; }); - +/* if (!seen_label) { ShellSafeWrite (topath (p + ("LABEL_" + anum)), anum); } +*/ }); } /* Write regular keys */ @@ -831,9 +832,9 @@ * for this hardware */ global list<string> GetDeviceTypes(){ - list<string> dev_types = ["eth", "tr", "vlan", "br", "tun", "tap", "ib"]; + 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", "bond" ]); + 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, { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.9/library/system/src/Kernel.ycp new/yast2-2.18.12/library/system/src/Kernel.ycp --- old/yast2-2.18.9/library/system/src/Kernel.ycp 2008-12-01 09:32:06.000000000 +0100 +++ new/yast2-2.18.12/library/system/src/Kernel.ycp 2009-02-18 18:04:32.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Klaus Kaempf <kkaempf@suse.de> * Arvin Schnell <arvin@suse.de> * - * $Id: Kernel.ycp 53571 2008-11-25 11:40:57Z lslezak $ + * $Id: Kernel.ycp 55592 2009-02-18 14:39:30Z jsrain $ * * <ul> * <li>determine kernel rpm</li> @@ -379,16 +379,16 @@ y2error ("Cannot read cpuflags"); y2milestone ("Mounted: %1", SCR::Execute (.target.bash_output, "mount -l")); } -/* + // check for "roughly" >= 4GB memory (see bug #40729) list memories = (list) SCR::Read(.probe.memory); integer memsize = memories[0,"resource","phys_mem",0,"range"]:0; integer fourGB = 0x0C0000000; y2milestone ("Physical memory %1", memsize); -*/ + // for memory > 4GB and PAE support we install kernel-pae, - // only check PAE CPU - if (/*memsize >= fourGB &&*/ contains (cpuflags, "pae")) + // PAE kernel is needed if NX flag exists as well (bnc#467328) + if ((memsize >= fourGB || contains (cpuflags, "nx")) && contains (cpuflags, "pae")) { y2milestone ("Kernel switch: PAE detected"); kernel_packages = ["kernel-pae"]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.9/VERSION new/yast2-2.18.12/VERSION --- old/yast2-2.18.9/VERSION 2009-02-16 10:45:03.000000000 +0100 +++ new/yast2-2.18.12/VERSION 2009-02-24 18:24:40.000000000 +0100 @@ -1 +1 @@ -2.18.9 +2.18.12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org