Hello community,
here is the log from the commit of package yast2-network
checked in at Fri Aug 24 02:14:54 CEST 2007.
--------
--- yast2-network/yast2-network.changes 2007-08-17 15:48:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-08-21 10:57:34.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Aug 21 10:53:41 CEST 2007 - mzugec@suse.cz
+
+- correctly write wlan configuration (#297616)
+- 2.15.65
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.15.64.tar.bz2
New:
----
yast2-network-2.15.65.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.o20412/_old 2007-08-24 02:14:31.000000000 +0200
+++ /var/tmp/diff_new_pack.o20412/_new 2007-08-24 02:14:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.15.64)
+# spec file for package yast2-network (Version 2.15.65)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-network
-Version: 2.15.64
+Version: 2.15.65
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.64.tar.bz2
+Source0: yast2-network-2.15.65.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -43,12 +43,12 @@
Conflicts: yast2-core < 2.10.6
Summary: YaST2 - Network Configuration
%package devel-doc
-Version: 2.15.64
+Version: 2.15.65
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.64.tar.bz2
+Source0: yast2-network-2.15.65.tar.bz2
prefix: /usr
Requires: yast2-network >= 2.15.53
Summary: YaST2 - Developer documentation for yast2-network
@@ -73,7 +73,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.15.64
+%setup -n yast2-network-2.15.65
%build
%{prefix}/bin/y2tool y2autoconf
@@ -141,6 +141,9 @@
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Tue Aug 21 2007 - mzugec@suse.cz
+- correctly write wlan configuration (#297616)
+- 2.15.65
* Fri Aug 17 2007 - mzugec@suse.cz
- use correct NAME for eth/wlan devices (#300670)
- 2.15.64
++++++ yast2-network-2.15.64.tar.bz2 -> yast2-network-2.15.65.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.64/configure new/yast2-network-2.15.65/configure
--- old/yast2-network-2.15.64/configure 2007-08-17 15:44:17.000000000 +0200
+++ new/yast2-network-2.15.65/configure 2007-08-21 10:51:03.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-network 2.15.63.
+# Generated by GNU Autoconf 2.61 for yast2-network 2.15.64.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.15.63'
-PACKAGE_STRING='yast2-network 2.15.63'
+PACKAGE_VERSION='2.15.64'
+PACKAGE_STRING='yast2-network 2.15.64'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-network 2.15.63 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.15.64 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.15.63:";;
+ short | recursive ) echo "Configuration of yast2-network 2.15.64:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.15.63
+yast2-network configure 2.15.64
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-network $as_me 2.15.63, which was
+It was created by yast2-network $as_me 2.15.64, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.15.63'
+ VERSION='2.15.64'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.15.63"
+VERSION="2.15.64"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -3303,7 +3303,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-network $as_me 2.15.63, which was
+This file was extended by yast2-network $as_me 2.15.64, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3346,7 +3346,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.15.63
+yast2-network config.status 2.15.64
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.64/configure.in new/yast2-network-2.15.65/configure.in
--- old/yast2-network-2.15.64/configure.in 2007-08-17 15:44:05.000000000 +0200
+++ new/yast2-network-2.15.65/configure.in 2007-08-21 10:50:59.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.15.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.15.63, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.64, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.63"
+VERSION="2.15.64"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.64/Makefile.am new/yast2-network-2.15.65/Makefile.am
--- old/yast2-network-2.15.64/Makefile.am 2007-08-17 15:44:05.000000000 +0200
+++ new/yast2-network-2.15.65/Makefile.am 2007-08-21 10:50:59.000000000 +0200
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = agents data doc src testsuite
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.64/Makefile.in new/yast2-network-2.15.65/Makefile.in
--- old/yast2-network-2.15.64/Makefile.in 2007-08-17 15:44:24.000000000 +0200
+++ new/yast2-network-2.15.65/Makefile.in 2007-08-21 10:51:06.000000000 +0200
@@ -238,8 +238,7 @@
@CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc
@CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc
TAGVERSION = $(Y2TOOL) tagversion
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = agents data doc src testsuite
all: all-recursive
@@ -852,7 +851,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.64/src/lan/complex.ycp new/yast2-network-2.15.65/src/lan/complex.ycp
--- old/yast2-network-2.15.64/src/lan/complex.ycp 2007-08-17 13:00:57.000000000 +0200
+++ new/yast2-network-2.15.65/src/lan/complex.ycp 2007-08-21 10:57:17.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec
*
- * $Id: complex.ycp 40330 2007-08-17 10:55:11Z mzugec $
+ * $Id: complex.ycp 40375 2007-08-21 08:56:44Z mzugec $
*/
{
@@ -132,13 +132,10 @@
"rt73usb" : "",
"prism54usb":""
];
-/*
- Unsupported:
-rt61, rt2500, z1211
-*/
Lan::Add ();
LanItems::SelectHWMap(LanItems::getCurrentItem()["hwinfo"]:$[]);
+ LanItems::Items[LanItems::current, "ifcfg"] = LanItems::getCurrentItem()["hwinfo", "dev_name"]:"";
LanItems::operation = `edit;
// LanItems::SetDefaultsForHW ();
@@ -229,6 +226,13 @@
else UI::ChangeWidget(`id(`delete), `Enabled, true);
if (!hasAnyValue(LanItems::getCurrentItem()["hwinfo", "dev_name"]:"") && size(LanItems::getCurrentItem()["hwinfo"]:$[])>0) UI::ChangeWidget(`id(`edit), `Enabled, false);
else UI::ChangeWidget(`id(`edit), `Enabled, true);
+ if (!Mode::config() && Lan::HaveXenBridge ()) // #196479
+ {
+ // #178848
+ foreach (symbol b, [`add, `edit, `delete], {
+ UI::ChangeWidget (`id (b), `Enabled, false);
+ });
+ }
/*
if (hasAnyValue(LanItems::getCurrentItem()["hwinfo", "dev_name"]:"") && size(LanItems::getCurrentItem()["hwinfo"]:$[])>0) UI::ChangeWidget(`id(`edit), `Enabled, true);
else UI::ChangeWidget(`id(`edit), `Enabled, false);
@@ -246,14 +250,8 @@
});
UI::ChangeWidget (`id (`_hw_items), `Items, term_items);
- if (!Mode::config() && Lan::HaveXenBridge ()) // #196479
- {
- // #178848
- foreach (symbol b, [`add, `edit, `delete], {
- UI::ChangeWidget (`id (b), `Enabled, false);
- });
- }
enableDisableButtons();
+ y2milestone("LanItems %1", LanItems::Items);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.64/src/lan/hardware.ycp new/yast2-network-2.15.65/src/lan/hardware.ycp
--- old/yast2-network-2.15.64/src/lan/hardware.ycp 2007-08-10 17:24:04.000000000 +0200
+++ new/yast2-network-2.15.65/src/lan/hardware.ycp 2007-08-21 10:57:17.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hardware dialogs
* Authors: Michal Svec
*
- * $Id: hardware.ycp 40170 2007-08-10 11:22:46Z mzugec $
+ * $Id: hardware.ycp 40375 2007-08-21 08:56:44Z mzugec $
*/
{
@@ -62,7 +62,7 @@
}
map hardware = nil;
-map udev = nil;
+//map udev = nil;
boolean hw_standalone=false;
void initHardware(){
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.64/src/modules/LanItems.ycp new/yast2-network-2.15.65/src/modules/LanItems.ycp
--- old/yast2-network-2.15.64/src/modules/LanItems.ycp 2007-08-17 15:39:21.000000000 +0200
+++ new/yast2-network-2.15.65/src/modules/LanItems.ycp 2007-08-21 09:31:01.000000000 +0200
@@ -176,7 +176,7 @@
}
global void AddNew(){
- current = size(Items)+1;
+ current = size(Items);
operation = `add;
}
@@ -212,12 +212,16 @@
global void ReadNetworkInterfaces(){
NetworkDevices::Read();
NetworkDevices::CleanHotplugSymlink();
- foreach(string tmpdevname, (list<string>)Map::Keys(NetworkDevices::FilterDevices("netcard")["eth"]:$[]), {
- string confname = NetworkDevices::device_name("eth", tmpdevname);
- integer pos = nil;
- map val = $[];
- foreach(integer key, map value, (map >)Items, {
+ // match configurations to Items list with hwinfo
+ map configurations = NetworkDevices::FilterDevices("netcard");
+ foreach(string devtype, ["eth", "wlan"], {
+ foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), {
+ string confname = NetworkDevices::device_name(devtype, devnum);
+
+ integer pos = nil;
+ map val = $[];
+ foreach(integer key, map value, (map >)Items, {
if (value["hwinfo", "dev_name"]:""==confname) {
pos = key;
val = value;
@@ -228,25 +232,30 @@
Items[pos]=$[];
}
Items[pos, "ifcfg"] = confname;
+ });
});
- // add to items also virtual devices (configurations) without hwinfo
- foreach(string dev_name, map tmp_map, NetworkDevices::FilterDevices("netcard"), {
- foreach(string dev_num, (list<string>)Map::Keys(tmp_map), {
+ // add to Items also virtual devices (configurations) without hwinfo
+
+ foreach(string devtype, ["eth", "wlan"], {
+ foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), {
+
+// foreach(string dev_name, map tmp_map, NetworkDevices::FilterDevices("netcard"), {
+// foreach(string dev_num, (list<string>)Map::Keys(tmp_map), {
boolean already = false;
foreach(integer key, (list<integer>)Map::Keys(Items), {
- if (NetworkDevices::device_name(dev_name, dev_num) == Items[key, "ifcfg"]:""){
+ if (NetworkDevices::device_name(devtype, devnum) == Items[key, "ifcfg"]:""){
already = true;
break;
};
});
if (!already){
AddNew();
- Items[current] = $["ifcfg":NetworkDevices::device_name(dev_name, dev_num)];
+ Items[current] = $["ifcfg":NetworkDevices::device_name(devtype, devnum)];
}
});
});
- y2milestone("LanItems::Items %1", Items);
+ y2milestone("Read Configuration LanItems::Items %1", Items);
}
list GetDescr(){
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.64/VERSION new/yast2-network-2.15.65/VERSION
--- old/yast2-network-2.15.64/VERSION 2007-08-17 15:51:40.000000000 +0200
+++ new/yast2-network-2.15.65/VERSION 2007-08-21 10:53:38.000000000 +0200
@@ -1 +1 @@
-2.15.64
+2.15.65
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org