Hello community,
here is the log from the commit of package yast2
checked in at Wed Oct 18 15:39:39 CEST 2006.
--------
--- yast2/yast2.changes 2006-10-16 17:17:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2006-10-18 14:08:11.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Oct 18 13:47:50 CEST 2006 - kmachalkova@suse.cz
+
+- NetworkDevices: return device type (e.g. netcard, modem,..) in
+ human readable form
+- NetworkPopup: display more information (besides device id also
+ type, name and IP address)
+- Moved NetworkPopup.ycp from library/wizard to library/network
+- 2.14.5
+
+-------------------------------------------------------------------
Old:
----
yast2-2.14.4.tar.bz2
New:
----
yast2-2.14.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.7V25yk/_old 2006-10-18 15:39:20.000000000 +0200
+++ /var/tmp/diff_new_pack.7V25yk/_new 2006-10-18 15:39:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.14.4)
+# spec file for package yast2 (Version 2.14.5)
#
# 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
-Version: 2.14.4
+Version: 2.14.5
Release: 1
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.14.4.tar.bz2
+Source0: yast2-2.14.5.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# Need the new file popups
@@ -97,7 +97,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.14.4
+%setup -n yast2-2.14.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -197,6 +197,13 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog -n yast2
+* Wed Oct 18 2006 - kmachalkova@suse.cz
+- NetworkDevices: return device type (e.g. netcard, modem,..) in
+ human readable form
+- NetworkPopup: display more information (besides device id also
+ type, name and IP address)
+- Moved NetworkPopup.ycp from library/wizard to library/network
+- 2.14.5
* Mon Oct 16 2006 - lslezak@suse.cz
- register script callbacks (feature #100233)
- 2.14.4
++++++ yast2-2.14.4.tar.bz2 -> yast2-2.14.5.tar.bz2 ++++++
++++ 3244 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-2.14.4/Makefile.am.common new/yast2-2.14.5/Makefile.am.common
--- old/yast2-2.14.4/Makefile.am.common 2006-10-16 16:52:10.000000000 +0200
+++ new/yast2-2.14.5/Makefile.am.common 2006-10-18 14:04:10.000000000 +0200
@@ -29,19 +29,7 @@
dist-hook: check-syntax
-CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- @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
+ if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; 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-2.14.4/VERSION new/yast2-2.14.5/VERSION
--- old/yast2-2.14.4/VERSION 2006-10-16 16:35:48.000000000 +0200
+++ new/yast2-2.14.5/VERSION 2006-10-18 13:47:25.000000000 +0200
@@ -1 +1 @@
-2.14.4
+2.14.5
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-2.14.4/configure.in new/yast2-2.14.5/configure.in
--- old/yast2-2.14.4/configure.in 2006-10-16 16:52:10.000000000 +0200
+++ new/yast2-2.14.5/configure.in 2006-10-18 14:04:10.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.13.16 - 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, 2.14.4, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.14.5, http://bugs.opensuse.org/, yast2)
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.14.4"
+VERSION="2.14.5"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
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-2.14.4/library/modules/Version.ycp new/yast2-2.14.5/library/modules/Version.ycp
--- old/yast2-2.14.4/library/modules/Version.ycp 2006-10-16 16:52:35.000000000 +0200
+++ new/yast2-2.14.5/library/modules/Version.ycp 2006-10-18 14:04:26.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.14.4";
+global string yast2 = "2.14.5";
/* EOF */
}
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-2.14.4/library/network/src/Makefile.am new/yast2-2.14.5/library/network/src/Makefile.am
--- old/yast2-2.14.4/library/network/src/Makefile.am 2006-09-27 14:24:44.000000000 +0200
+++ new/yast2-2.14.5/library/network/src/Makefile.am 2006-10-17 17:28:02.000000000 +0200
@@ -9,6 +9,7 @@
module_DATA = \
NetworkConfig.ycp \
NetworkDevices.ycp \
+ NetworkPopup.ycp \
NetworkService.ycp \
SuSEFirewall.ycp \
SuSEFirewallServices.ycp \
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-2.14.4/library/network/src/NetworkDevices.ycp new/yast2-2.14.5/library/network/src/NetworkDevices.ycp
--- old/yast2-2.14.4/library/network/src/NetworkDevices.ycp 2006-04-07 14:24:06.000000000 +0200
+++ new/yast2-2.14.5/library/network/src/NetworkDevices.ycp 2006-10-18 13:58:52.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Interface manipulation (/etc/sysconfig/network/ifcfg-*)
* Authors: Michal Svec
*
- * $Id: NetworkDevices.ycp 29693 2006-04-05 07:49:19Z locilka $
+ * $Id: NetworkDevices.ycp 33491 2006-10-18 11:58:49Z kmachalkova $
*
* The new sysconfig naming is interface (eg. eth0) vs. device
* (eg. NE2000 card), but historically yast has called them device
@@ -14,6 +14,7 @@
{
module "NetworkDevices";
+textdomain "base";
import "Arch";
import "Map";
@@ -179,6 +180,29 @@
}
/**
+ * Return device type in human readable form :-)
+ * @param dev device
+ * @return device type
+ * @example GetDeviceType(eth-bus-pci-0000:01:07.0) -> "network card"
+ * @example GetDeviceType(modem0) -> "modem"
+ */
+global string GetDeviceType(string dev) {
+ if (regexpmatch(dev,"^" + DeviceRegex["netcard"]:"")) {
+ return(_("network card"));
+ }
+ else if (regexpmatch(dev,"^" + DeviceRegex["modem"]:"")) {
+ return(_("modem"));
+ }
+ else if (regexpmatch(dev,"^" + DeviceRegex["isdn"]:"")) {
+ return(_("ISDN"));
+ }
+ else if (regexpmatch(dev,"^" + DeviceRegex["dsl"]:"")) {
+ return(_("DSL"));
+ }
+ else return(_("unknown"));
+}
+
+/**
* Return a device number
* @param dev device
* @return device number
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-2.14.4/library/network/src/NetworkPopup.ycp new/yast2-2.14.5/library/network/src/NetworkPopup.ycp
--- old/yast2-2.14.4/library/network/src/NetworkPopup.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.14.5/library/network/src/NetworkPopup.ycp 2006-10-18 14:02:48.000000000 +0200
@@ -0,0 +1,165 @@
+/**
+ * File:
+ * NetworkPopup.ycp
+ *
+ * Summary:
+ * Popup dialogs for browsing the local network
+ *
+ * Authors:
+ * Martin Vidner
+ * Ladislav Slezak
+ *
+ * $Id: NetworkPopup.ycp 33492 2006-10-18 12:02:47Z kmachalkova $
+ *
+ * Network browsing dialogs - all hosts, NFS servers, exports of the NFS server
+ *
+ */
+
+{
+ module "NetworkPopup";
+
+ textdomain "base";
+
+ import "Label";
+ import "NetworkDevices";
+
+ // cache all found hosts on the local network
+ list<string> found_hosts = nil;
+
+ // cache all found NFS servers on the local network
+ list<string> found_nfs_servers = nil;
+
+ /**
+ * Let the user choose one of a list of items
+ * @param title selectionbox title
+ * @param items a list of items
+ * @param selected preselected a value in the list
+ * @return one item or nil
+ */
+ global define string ChooseItem (string title, list<string> items, string selected) ``{
+ string item = nil;
+
+ list Items = maplist(string i, items, ``{
+ string device_name = NetworkDevices::GetValue(i, "NAME");
+ if (size(device_name) > 30) {
+ device_name = substring (device_name, 0, 27) + "...";
+ }
+ // translators: table item, informing that IP address is assigned via DHCP
+ return `item(`id(i), NetworkDevices::GetDeviceType(i), device_name, (NetworkDevices::GetValue(i, "BOOTPROTO") == "dhcp" ?
+ _("DHCP address"): NetworkDevices::GetValue(i, "IPADDR")), i);
+ }
+ );
+
+ UI::OpenDialog (
+ `VBox (
+ `HSpacing (60),
+ `HBox (
+ // translators: table header - details about the network device
+ `Table(`id(`items), `header(_("Device Type"),_("Device Name"),_("IP Address"),_("Device ID")), Items),
+ `VSpacing(10)
+ ),
+ `HBox (
+ `PushButton (`id(`ok), `opt(`default, `key_F10),
+ Label::OKButton()),
+ `PushButton (`id(`cancel), `opt(`key_F9),
+ Label::CancelButton())
+ )
+ ));
+ UI::ChangeWidget(`id(`items), `CurrentItem, selected);
+ UI::SetFocus (`id (`items));
+ symbol ret = nil;
+ do
+ {
+ ret = (symbol)UI::UserInput();
+ }
+ while (ret != `cancel && ret != `ok);
+
+ if (ret == `ok)
+ {
+ item = (string)UI::QueryWidget (`id (`items), `CurrentItem);
+ }
+ UI::CloseDialog();
+
+ return item;
+ }
+
+ /**
+ * Give me NFS server name on the local network
+ *
+ * display dialog with all local NFS servers
+ * @param selected preselected a value in the list
+ * @return a hostname or nil if "Cancel" was pressed
+ */
+ global define string NFSServer(string selected) ``{
+
+ if (found_nfs_servers == nil)
+ {
+ // label message
+ UI::OpenDialog(`Label(_("Scanning for hosts on this LAN...")));
+ found_nfs_servers = (list<string>)SCR::Read(.net.hostnames.rpc, "nfs");
+ UI::CloseDialog();
+
+ if (found_nfs_servers == nil)
+ {
+ found_nfs_servers = [];
+ }
+ else
+ {
+ // sort list of servers
+ found_nfs_servers = sort(found_nfs_servers);
+ }
+ }
+
+ // selection box label
+ string ret = ChooseItem(_("&NFS Servers"), found_nfs_servers, selected);
+ return ret;
+ }
+
+ /**
+ * Give me one host name on the local network
+ *
+ * display dialog with all hosts on the local network
+ * @param selected preselect a value in the list
+ * @return a hostname or nil if "Cancel" was pressed
+ */
+ global define string HostName(string selected) ``{
+ if (found_hosts == nil)
+ {
+ // label message
+ UI::OpenDialog(`Label(_("Scanning for hosts on this LAN...")));
+ found_hosts = (list<string>)sort((list)SCR::Read(.net.hostnames));
+ UI::CloseDialog();
+
+ if (found_hosts == nil)
+ {
+ found_hosts = [];
+ }
+ }
+
+ // selection box label
+ string ret = ChooseItem(_("Re&mote Hosts"), found_hosts, selected);
+ return ret;
+ }
+
+ /**
+ * Give me export path of selected server
+ *
+ * display dialog with all exported directories from the selected server
+ * @param server a NFS server name
+ * @param selected preselected a value in the list
+ * @return an export or nil if "Cancel" was pressed
+ */
+ global define string NFSExport(string server, string selected) ``{
+ list<string> dirs = (list<string>)SCR::Read(.net.showexports, server);
+
+ if (dirs == nil)
+ {
+ dirs = [];
+ }
+
+ // selection box label
+ string ret = ChooseItem(_("&Exported Directories"), dirs, selected);
+ return ret;
+ }
+
+}
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-2.14.4/library/wizard/src/Makefile.am new/yast2-2.14.5/library/wizard/src/Makefile.am
--- old/yast2-2.14.4/library/wizard/src/Makefile.am 2006-01-06 16:17:28.000000000 +0100
+++ new/yast2-2.14.5/library/wizard/src/Makefile.am 2006-10-17 17:20:40.000000000 +0200
@@ -7,7 +7,6 @@
module_DATA = \
Confirm.ycp \
- NetworkPopup.ycp \
Wizard.ycp \
Wizard_hw.ycp \
Progress.ycp \
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-2.14.4/library/wizard/src/NetworkPopup.ycp new/yast2-2.14.5/library/wizard/src/NetworkPopup.ycp
--- old/yast2-2.14.4/library/wizard/src/NetworkPopup.ycp 2005-03-24 17:00:57.000000000 +0100
+++ new/yast2-2.14.5/library/wizard/src/NetworkPopup.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,156 +0,0 @@
-/**
- * File:
- * NetworkPopup.ycp
- *
- * Summary:
- * Popup dialogs for browsing the local network
- *
- * Authors:
- * Martin Vidner
- * Ladislav Slezak
- *
- * $Id: NetworkPopup.ycp 19408 2004-09-16 04:25:07Z nashif $
- *
- * Network browsing dialogs - all hosts, NFS servers, exports of the NFS server
- *
- */
-
-{
- module "NetworkPopup";
-
- textdomain "base";
-
- import "Label";
-
- // cache all found hosts on the local network
- list<string> found_hosts = nil;
-
- // cache all found NFS servers on the local network
- list<string> found_nfs_servers = nil;
-
- /**
- * Let the user choose one of a list of items
- * @param title selectionbox title
- * @param items a list of items
- * @param selected preselected a value in the list
- * @return one item or nil
- */
- global define string ChooseItem (string title, list<string> items, string selected) ``{
- string item = nil;
-
- list Items = maplist(string i, items, ``{
- return `item(`id(i), i, i == selected);
- }
- );
-
- UI::OpenDialog (
- `VBox (
- `HSpacing (40),
- `HBox (
- `SelectionBox (`id (`items), title, Items),
- `VSpacing(10)
- ),
- `HBox (
- `PushButton (`id(`ok), `opt(`default, `key_F10),
- Label::OKButton()),
- `PushButton (`id(`cancel), `opt(`key_F9),
- Label::CancelButton())
- )
- ));
- UI::SetFocus (`id (`items));
- symbol ret = nil;
- do
- {
- ret = (symbol)UI::UserInput();
- }
- while (ret != `cancel && ret != `ok);
-
- if (ret == `ok)
- {
- item = (string)UI::QueryWidget (`id (`items), `CurrentItem);
- }
- UI::CloseDialog();
-
- return item;
- }
-
- /**
- * Give me NFS server name on the local network
- *
- * display dialog with all local NFS servers
- * @param selected preselected a value in the list
- * @return a hostname or nil if "Cancel" was pressed
- */
- global define string NFSServer(string selected) ``{
-
- if (found_nfs_servers == nil)
- {
- // label message
- UI::OpenDialog(`Label(_("Scanning for hosts on this LAN...")));
- found_nfs_servers = (list<string>)SCR::Read(.net.hostnames.rpc, "nfs");
- UI::CloseDialog();
-
- if (found_nfs_servers == nil)
- {
- found_nfs_servers = [];
- }
- else
- {
- // sort list of servers
- found_nfs_servers = sort(found_nfs_servers);
- }
- }
-
- // selection box label
- string ret = ChooseItem(_("&NFS Servers"), found_nfs_servers, selected);
- return ret;
- }
-
- /**
- * Give me one host name on the local network
- *
- * display dialog with all hosts on the local network
- * @param selected preselect a value in the list
- * @return a hostname or nil if "Cancel" was pressed
- */
- global define string HostName(string selected) ``{
- if (found_hosts == nil)
- {
- // label message
- UI::OpenDialog(`Label(_("Scanning for hosts on this LAN...")));
- found_hosts = (list<string>)sort((list)SCR::Read(.net.hostnames));
- UI::CloseDialog();
-
- if (found_hosts == nil)
- {
- found_hosts = [];
- }
- }
-
- // selection box label
- string ret = ChooseItem(_("Re&mote Hosts"), found_hosts, selected);
- return ret;
- }
-
- /**
- * Give me export path of selected server
- *
- * display dialog with all exported directories from the selected server
- * @param server a NFS server name
- * @param selected preselected a value in the list
- * @return an export or nil if "Cancel" was pressed
- */
- global define string NFSExport(string server, string selected) ``{
- list<string> dirs = (list<string>)SCR::Read(.net.showexports, server);
-
- if (dirs == nil)
- {
- dirs = [];
- }
-
- // selection box label
- string ret = ChooseItem(_("&Exported Directories"), dirs, selected);
- return ret;
- }
-
-}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org