Mailinglist Archive: opensuse-commit (1670 mails)

< Previous Next >
commit yast2-network
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 12 Oct 2006 15:09:18 +0200 (CEST)
  • Message-id: <20061012130918.70DD219AA06@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-network
checked in at Thu Oct 12 15:09:18 CEST 2006.

--------
--- yast2-network/yast2-network.changes 2006-09-25 15:27:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2006-10-12 11:00:09.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Oct 12 10:59:39 CEST 2006 - mvidner@xxxxxxx
+
+- Disabled conflicting definitions in host.rnc from last change.
+- 2.13.67
+
+-------------------------------------------------------------------

Old:
----
yast2-network-2.13.66.tar.bz2

New:
----
yast2-network-2.13.67.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.6OPMWO/_old 2006-10-12 15:08:51.000000000 +0200
+++ /var/tmp/diff_new_pack.6OPMWO/_new 2006-10-12 15:08:51.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.13.66)
+# spec file for package yast2-network (Version 2.13.67)
#
# Copyright (c) 2006 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.13.66
+Version: 2.13.67
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.13.66.tar.bz2
+Source0: yast2-network-2.13.67.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -50,7 +50,7 @@
Michal Svec <msvec@xxxxxxx>

%prep
-%setup -n yast2-network-2.13.66
+%setup -n yast2-network-2.13.67

%build
%{prefix}/bin/y2tool y2autoconf
@@ -105,6 +105,9 @@
/usr/share/YaST2/schema/autoyast/rnc/host.rnc

%changelog -n yast2-network
+* Thu Oct 12 2006 - mvidner@xxxxxxx
+- Disabled conflicting definitions in host.rnc from last change.
+- 2.13.67
* Mon Sep 25 2006 - kmachalkova@xxxxxxx
- Better autoyast XML validation for networking and host
- Conversion function in Host::Import to handle older profiles

++++++ yast2-network-2.13.66.tar.bz2 -> yast2-network-2.13.67.tar.bz2 ++++++
++++ 13389 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.13.66/Makefile.am new/yast2-network-2.13.67/Makefile.am
--- old/yast2-network-2.13.66/Makefile.am 2006-09-25 13:22:22.000000000 +0200
+++ new/yast2-network-2.13.67/Makefile.am 2006-10-12 11:10:46.000000000 +0200
@@ -67,7 +67,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<

if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.13.66/Makefile.am.common new/yast2-network-2.13.67/Makefile.am.common
--- old/yast2-network-2.13.66/Makefile.am.common 2006-09-25 13:22:22.000000000 +0200
+++ new/yast2-network-2.13.67/Makefile.am.common 2006-10-12 11:10:46.000000000 +0200
@@ -29,7 +29,19 @@

dist-hook: check-syntax

+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi

-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.13.66/VERSION new/yast2-network-2.13.67/VERSION
--- old/yast2-network-2.13.66/VERSION 2006-09-25 15:16:06.000000000 +0200
+++ new/yast2-network-2.13.67/VERSION 2006-10-12 10:58:46.000000000 +0200
@@ -1 +1 @@
-2.13.66
+2.13.67
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.13.66/configure.in new/yast2-network-2.13.67/configure.in
--- old/yast2-network-2.13.66/configure.in 2006-09-25 13:22:21.000000000 +0200
+++ new/yast2-network-2.13.67/configure.in 2006-10-12 11:10:41.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.26 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-network, 2.13.65, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.13.67, 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.13.65"
+VERSION="2.13.67"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.13.66/src/clients/lan.ycp new/yast2-network-2.13.67/src/clients/lan.ycp
--- old/yast2-network-2.13.66/src/clients/lan.ycp 2006-08-11 09:23:30.000000000 +0200
+++ new/yast2-network-2.13.67/src/clients/lan.ycp 2006-10-12 10:49:58.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network cards main file
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: lan.ycp 27593 2006-02-05 16:39:17Z mvidner $
+ * $Id: lan.ycp 33322 2006-10-10 17:31:47Z mzugec $
*
* Main file for network card configuration.
* Uses all other files.
@@ -49,6 +49,12 @@
"example" : "lan list configured",
"handler" : ListHandler,
],
+ "show" : $[
+ /* Commandline command help */
+ "help" : _("Display configuration summary"),
+ "example" : "lan show id=...",
+ "handler" : ShowHandler,
+ ],
"add" : $[
/* Commandline command help */
"help" : _("Add a network card"),
@@ -81,12 +87,28 @@
"type" : "string",
"example" : "lan add device=eth0"
],
+ "id" : $[
+ /* Commandline option help */
+ "help" : _("Config identifier"),
+ "type" : "string",
+ "example" : "lan show id=0"
+ ],
+ "bootproto" : $[
+ "help" : _("Use static or dynamic configuration"),
+ "type" : "string",
+ "example" : "add type=ethernet bootproto=dhcp"
+ ],
+ "type" : $[
+ "help" : _("Device type"),
+ "type" : "string",
+ "example" : "add type=bluetooth"
+ ],
"bootproto" : $[
/* Commandline option help */
"help": _("Device boot protocol"),
"type": "string"
],
- "ipaddr" : $[
+ "ip" : $[
/* Commandline option help */
"help": _("Device IP address"),
"type": "ip"
@@ -99,8 +121,9 @@
],
"mappings" : $[
"list" : [ "configured", "unconfigured" ],
- "add" : [ "device", "bootproto", "ipaddr", "netmask" ],
- "delete": [ "device" ],
+ "show" : [ "id" ],
+ "add" : [ "type", "bootproto", "ip", "netmask" ],
+ "delete": [ "id" ],
]
];

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.13.66/src/config/host.rnc new/yast2-network-2.13.67/src/config/host.rnc
--- old/yast2-network-2.13.66/src/config/host.rnc 2006-09-22 16:04:08.000000000 +0200
+++ new/yast2-network-2.13.67/src/config/host.rnc 2006-10-12 10:54:35.000000000 +0200
@@ -1,9 +1,11 @@
default namespace = "http://www.suse.com/1.0/yast2ns";
namespace config = "http://www.suse.com/1.0/configns";
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0";
-include "common.rnc"
-# to be overriden if included
-start = element profile { host }
+# These currently conflict with the including files
+# which would need adjustments
+#include "common.rnc"
+## to be overriden if included
+#start = element profile { host }

host =
element host {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.13.66/src/lan/address.ycp new/yast2-network-2.13.67/src/lan/address.ycp
--- old/yast2-network-2.13.66/src/lan/address.ycp 2006-09-01 09:30:44.000000000 +0200
+++ new/yast2-network-2.13.67/src/lan/address.ycp 2006-10-12 10:49:59.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: address.ycp 32628 2006-08-30 11:37:04Z mzugec $
+ * $Id: address.ycp 33322 2006-10-10 17:31:47Z mzugec $
*/

{
@@ -642,6 +642,7 @@
* @return dialog result
*/
define any AddressDialog() {
+y2internal("AddressDialog");
ScreenName("lan-address");

string ifname = NetworkDevices::device_name (Lan::type, Lan::device);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.13.66/src/lan/cmdline.ycp new/yast2-network-2.13.67/src/lan/cmdline.ycp
--- old/yast2-network-2.13.66/src/lan/cmdline.ycp 2006-08-11 09:23:40.000000000 +0200
+++ new/yast2-network-2.13.67/src/lan/cmdline.ycp 2006-10-12 10:49:59.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network cards cmdline handlers
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: cmdline.ycp 21544 2005-02-11 16:24:46Z mvidner $
+ * $Id: cmdline.ycp 33322 2006-10-10 17:31:47Z mzugec $
*/

{
@@ -16,45 +16,110 @@
import "Lan";
import "NetworkDevices";
import "RichText";
+import "Report";
+
+list <map<string, any> > getConfigList(){
+ list <map<string, any> > confList = [];
+ integer count = 0;
+ list<map<string,any> > overview = (list<map<string,any> >)Lan::Overview();
+ overview = overview + Lan::Unconfigured ();
+ foreach(map<string, any> row, overview, {
+ confList = add(confList, $[tostring(count) : $["id" : row["id"]:"",
+ "rich_descr" : row["rich_descr"]:"",
+ "descr" : row["table_descr", 0]:"",
+ "addr" : row["table_descr", 1]:""]]);
+ count = count + 1;
+ });
+ return confList;
+}
+
+boolean validateId(map<string, string> options, list <map<string, any> > config){
+ if (options["id"]:nil == nil){
+ Report::Error( _("Use \"id\" option to determine device."));
+ return false;
+ }
+
+ if (tointeger(options["id"]:"0")>size(config)-1){
+ Report::Error( _("Value of \"id\" is out of range. Use \"list\" option to check max. value of \"id\"."));
+ return false;
+ }
+ return true;
+}
+

/**
- * Handler for action "list"
+ * Handler for action "show"
* @param options action options
*/
-define boolean ListHandler(map<string, string> options) {
-
- boolean cf = false;
- boolean uncf = false;
- if(options["configured"]:nil != nil) cf = true;
- if(options["unconfigured"]:nil != nil) uncf = true;
-
- string summary = "";
- if(cf == false && uncf == false)
- /* Headline */
- summary = "\n" + _("Network Configuration Summary:") + "\n\n" +
- RichText::Rich2Plain(Lan::Summary("summary")[0]:"") + "\n";
- else {
- list l = Lan::Summary("split");
- if(cf) summary = RichText::Rich2Plain(sformat("%1", l[0]:"")) + "\n";
- /* Headline */
- if(uncf) summary = _("Available Devices:") + "\n" +
- sformat("%1", mergestring(maplist(term i, l[1]:[], { return "* " + i[1]:"" + "\n"; } ), ""));
- summary = "\n" + summary;
- }
-
- y2debug("%1", summary);
- CommandLine::Print(summary);
+define boolean ShowHandler(map<string, string> options) {
+ list <map<string, any> > config = getConfigList();
+ if (validateId(options, config)==false) return false;
+ foreach(map<string, any> row, config, {
+ foreach(string key, map<string, any> value, (map<string, map<string, any> >) row, {
+ if (key == options["id"]:"0"){
+ string text = sformat("echo \"%1\"|sed s/'<[/a-z]*>'/'\\n'/g", value["rich_descr"]:"");
+ map<string, any> descr = (map<string, any>)SCR::Execute(.target.bash_output, text);
+ y2internal("%1", descr);
+ CommandLine::Print( descr["stdout"]:"" );
+ }
+ });
+ });
return true;
}

+define boolean ListHandler(map<string, string> options) {
+ foreach(map<string, any> row, getConfigList(), {
+ foreach(string id, map <string,any> detail, (map<string, map<string, any> >)row, {
+ CommandLine::Print(sformat("%1\t%2, %3\n",id, detail["descr"]:"", detail["addr"]:""));
+ });
+ });
+ return true;
+}
/**
* Handler for action "add"
* @param options action options
*/
define boolean AddHandler(map<string, string> options) {
- string dev = options["device"]:"";
-
- /* Progress text */
+ Lan::type = options["type"]:"ethernet";
+ if (!contains(["arcnet", "bluetooth", "dummy", "ethernet", "fddi", "myrinet", "token-ring", "usb", "wireless"], Lan::type)){
+ Report::Error(_("Not possible value for type!"));
+ return false;
+ }
+ Lan::bootproto = options["bootproto"]:"none";
+ if (!contains(["none", "static", "dhcp"], Lan::bootproto)){
+ Report::Error(_("Not possible value for bootproto!"));
+ return false;
+ }
+ Lan::ipaddr = options["ip"]:"";
+ Lan::netmask = options["netmask"]:"255.255.255.0";
+ Lan::startmode = options["startmode"]:"auto";
+ if (!contains(["auto", "ifplugd", "nfsroot"], Lan::startmode)){
+ Report::Error(_("Not possible value for startmode!"));
+ return false;
+ }
+
+
+ map<string, any> settings = $[
+ "STARTMODE": Lan::startmode,
+ "USERCONTROL": Lan::usercontrol,
+ // problems when renaming the interface?
+ "FWZONE": "EXT",
+ "MTU": Lan::mtu,
+ "BOOTPROTO": Lan::bootproto,
+ "IPADDR": Lan::ipaddr,
+ "NETMASK": Lan::netmask,
+ "REMOTEIP": Lan::remoteip,
+ "IFCFGTYPE": Lan::type,
+ "IFCFGID": Lan::device,
+ ];
+
+
+y2internal("%1", settings);
+ CommandLine::Print(Lan::type);
+ CommandLine::Print(Lan::bootproto);
+ CommandLine::Print(Lan::ipaddr);
+ CommandLine::Print(Lan::netmask);
+/*
CommandLine::Print(sformat(_("Adding Device: %1"), dev));

if(!Lan::Add()) {
@@ -69,8 +134,9 @@
Lan::device = NetworkDevices::device_num(dev);

Lan::Commit();
- /* Progress result */
CommandLine::Print(_("Success"));
+*/
+
return true;
}

@@ -79,20 +145,20 @@
* @param options action options
*/
define boolean DeleteHandler(map<string, string> options) {
- string dev = options["device"]:"";
+ list <map<string, any> > config = getConfigList();
+ if (validateId(options, config)==false) return false;
+ foreach(map<string, any> row, config, {
+ foreach(string key, map<string, any> value, (map<string, map<string, any> >) row, {
+ if (key == options["id"]:"0"){
+ string id = value["id"]:"";
+ Lan::Delete(id);
+ Lan::Commit();
+ CommandLine::Print(_("The device was deleted."));
+ }
+ });
+ });

- /* Progress text */
- CommandLine::Print(sformat(_("Deleting Device: %1"), dev));

- if(Lan::Delete(dev) && Lan::Commit())
- /* Progress result */
- CommandLine::Print(_("Success"));
- else
- {
- /* Progress result */
- CommandLine::Print(Label::ErrorMsg());
- return false;
- }
return true;
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.13.66/src/lan/complex.ycp new/yast2-network-2.13.67/src/lan/complex.ycp
--- old/yast2-network-2.13.66/src/lan/complex.ycp 2006-09-20 14:16:51.000000000 +0200
+++ new/yast2-network-2.13.67/src/lan/complex.ycp 2006-10-12 10:49:59.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: complex.ycp 33005 2006-09-20 12:18:29Z kmachalkova $
+ * $Id: complex.ycp 33322 2006-10-10 17:31:47Z mzugec $
*/

{
@@ -246,7 +246,7 @@
* @return dialog result
*/
define any OverviewDialog() ``{
-
+y2internal("OverviewDialog");
ScreenName("lan-overview");

/* Network cards overview dialog caption */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.13.66/src/lan/hardware.ycp new/yast2-network-2.13.67/src/lan/hardware.ycp
--- old/yast2-network-2.13.66/src/lan/hardware.ycp 2006-08-16 16:08:44.000000000 +0200
+++ new/yast2-network-2.13.67/src/lan/hardware.ycp 2006-10-12 10:49:59.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hardware dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: hardware.ycp 32337 2006-08-11 08:59:28Z mvidner $
+ * $Id: hardware.ycp 33322 2006-10-10 17:31:47Z mzugec $
*/

{
@@ -143,7 +143,6 @@
CheckBoxes,
`VSpacing(0.4)
),`HSpacing(0.5)));
-
list devices = Lan::FreeDevices(realtype); // TODO: id-, bus-, ... here
if(!contains(devices, device)) devices = prepend(devices, device);

@@ -445,7 +444,6 @@

y2milestone("type=%1",type);
}
-
return ret;
}



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >