Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit yast2-network
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 06 Sep 2007 20:58:28 +0200
- Message-id: <20070906185829.06BF1678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-network
checked in at Thu Sep 6 20:58:28 CEST 2007.
--------
--- yast2-network/yast2-network.changes 2007-09-03 14:43:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-09-06 16:25:27.000000000 +0200
@@ -1,0 +2,34 @@
+Thu Sep 6 16:22:18 CEST 2007 - mzugec@xxxxxxx
+
+- fixed missing space between source and destination when copy udev
+rules into installed system (#307162)
+
+-------------------------------------------------------------------
+Thu Sep 6 14:24:50 CEST 2007 - mzugec@xxxxxxx
+
+- Finish button renamed to Accept for installation (#307789)
+
+-------------------------------------------------------------------
+Thu Sep 6 14:05:18 CEST 2007 - mzugec@xxxxxxx
+
+- for `abort in network dialogs use LanItems::Rollback (#307779)
+- workflow for add/edit card can be aborted (#307778)
+- 2.15.74
+
+-------------------------------------------------------------------
+Wed Sep 5 14:23:30 CEST 2007 - kmachalkova@xxxxxxx
+
+- Proxy testsuite adjusted to correct .curlrc syntax (#305163 related)
+- Fix downloading release notes with proxy (#305222)
+- Save proxy settings at the end of 1st stage of installation
+ (#298001)
+- Save nameserver entry at the end of 1st stage of installation even
+ if no search domain is present in install.inf (#298001)
+
+-------------------------------------------------------------------
+Tue Sep 4 15:14:46 CEST 2007 - mzugec@xxxxxxx
+
+- WLAN Installation - save data from install.inf (#223570)
+- 2.15.73
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.15.72.tar.bz2
New:
----
yast2-network-2.15.74.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.YSI435/_old 2007-09-06 20:58:01.000000000 +0200
+++ /var/tmp/diff_new_pack.YSI435/_new 2007-09-06 20:58:01.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.15.72)
+# spec file for package yast2-network (Version 2.15.74)
#
# 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.72
+Version: 2.15.74
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.72.tar.bz2
+Source0: yast2-network-2.15.74.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.72
+Version: 2.15.74
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.72.tar.bz2
+Source0: yast2-network-2.15.74.tar.bz2
prefix: /usr
Requires: yast2-network >= 2.15.53
Summary: YaST2 - Developer documentation for yast2-network
@@ -73,7 +73,7 @@
Michal Svec <msvec@xxxxxxx>
%prep
-%setup -n yast2-network-2.15.72
+%setup -n yast2-network-2.15.74
%build
%{prefix}/bin/y2tool y2autoconf
@@ -141,6 +141,25 @@
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Thu Sep 06 2007 - mzugec@xxxxxxx
+- fixed missing space between source and destination when copy udev
+ rules into installed system (#307162)
+* Thu Sep 06 2007 - mzugec@xxxxxxx
+- Finish button renamed to Accept for installation (#307789)
+* Thu Sep 06 2007 - mzugec@xxxxxxx
+- for `abort in network dialogs use LanItems::Rollback (#307779)
+- workflow for add/edit card can be aborted (#307778)
+- 2.15.74
+* Wed Sep 05 2007 - kmachalkova@xxxxxxx
+- Proxy testsuite adjusted to correct .curlrc syntax (#305163 related)
+- Fix downloading release notes with proxy (#305222)
+- Save proxy settings at the end of 1st stage of installation
+ (#298001)
+- Save nameserver entry at the end of 1st stage of installation even
+ if no search domain is present in install.inf (#298001)
+* Tue Sep 04 2007 - mzugec@xxxxxxx
+- WLAN Installation - save data from install.inf (#223570)
+- 2.15.73
* Mon Sep 03 2007 - mzugec@xxxxxxx
- install smartlink-softmodem package for devices with *ttySL*
device files (#284287)
++++++ yast2-network-2.15.72.tar.bz2 -> yast2-network-2.15.74.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/agents/Makefile.in new/yast2-network-2.15.74/agents/Makefile.in
--- old/yast2-network-2.15.72/agents/Makefile.in 2007-09-03 14:28:40.000000000 +0200
+++ new/yast2-network-2.15.74/agents/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -192,9 +192,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign agents/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu agents/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign agents/Makefile
+ $(AUTOMAKE) --gnu agents/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/configure new/yast2-network-2.15.74/configure
--- old/yast2-network-2.15.72/configure 2007-09-03 14:28:43.000000000 +0200
+++ new/yast2-network-2.15.74/configure 2007-09-06 16:19:34.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.71.
+# Generated by GNU Autoconf 2.61 for yast2-network 2.15.74.
#
# 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.71'
-PACKAGE_STRING='yast2-network 2.15.71'
+PACKAGE_VERSION='2.15.74'
+PACKAGE_STRING='yast2-network 2.15.74'
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.71 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.15.74 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.71:";;
+ short | recursive ) echo "Configuration of yast2-network 2.15.74:";;
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.71
+yast2-network configure 2.15.74
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.71, which was
+It was created by yast2-network $as_me 2.15.74, 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.71'
+ VERSION='2.15.74'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.15.71"
+VERSION="2.15.74"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"
@@ -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.71, which was
+This file was extended by yast2-network $as_me 2.15.74, 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.71
+yast2-network config.status 2.15.74
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.72/configure.in new/yast2-network-2.15.74/configure.in
--- old/yast2-network-2.15.72/configure.in 2007-09-03 14:28:22.000000000 +0200
+++ new/yast2-network-2.15.74/configure.in 2007-09-06 16:19:25.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.15.71, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.74, 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.71"
+VERSION="2.15.74"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/data/Makefile.in new/yast2-network-2.15.74/data/Makefile.in
--- old/yast2-network-2.15.72/data/Makefile.in 2007-09-03 14:28:40.000000000 +0200
+++ new/yast2-network-2.15.74/data/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -184,9 +184,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign data/Makefile
+ $(AUTOMAKE) --gnu data/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/doc/autodocs/Makefile.in new/yast2-network-2.15.74/doc/autodocs/Makefile.in
--- old/yast2-network-2.15.72/doc/autodocs/Makefile.in 2007-09-03 14:28:41.000000000 +0200
+++ new/yast2-network-2.15.74/doc/autodocs/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -186,9 +186,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/autodocs/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/autodocs/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign doc/autodocs/Makefile
+ $(AUTOMAKE) --gnu doc/autodocs/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/doc/Makefile.in new/yast2-network-2.15.74/doc/Makefile.in
--- old/yast2-network-2.15.72/doc/Makefile.in 2007-09-03 14:28:41.000000000 +0200
+++ new/yast2-network-2.15.74/doc/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -202,9 +202,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign doc/Makefile
+ $(AUTOMAKE) --gnu doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/Makefile.am new/yast2-network-2.15.74/Makefile.am
--- old/yast2-network-2.15.72/Makefile.am 2007-09-03 14:28:23.000000000 +0200
+++ new/yast2-network-2.15.74/Makefile.am 2007-09-06 16:19:25.000000000 +0200
@@ -30,7 +30,7 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/Makefile.in new/yast2-network-2.15.74/Makefile.in
--- old/yast2-network-2.15.72/Makefile.in 2007-09-03 14:28:43.000000000 +0200
+++ new/yast2-network-2.15.74/Makefile.in 2007-09-06 16:19:36.000000000 +0200
@@ -86,8 +86,8 @@
{ test ! -d $(distdir) \
|| { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
@@ -222,7 +222,7 @@
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
@@ -517,7 +517,6 @@
$(am__remove_distdir)
dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/clients/Makefile.in new/yast2-network-2.15.74/src/clients/Makefile.in
--- old/yast2-network-2.15.72/src/clients/Makefile.in 2007-09-03 14:28:41.000000000 +0200
+++ new/yast2-network-2.15.74/src/clients/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -205,9 +205,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/clients/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/clients/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/clients/Makefile
+ $(AUTOMAKE) --gnu src/clients/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/clients/save_network.ycp new/yast2-network-2.15.74/src/clients/save_network.ycp
--- old/yast2-network-2.15.72/src/clients/save_network.ycp 2007-09-03 09:30:14.000000000 +0200
+++ new/yast2-network-2.15.74/src/clients/save_network.ycp 2007-09-06 16:16:32.000000000 +0200
@@ -18,6 +18,7 @@
import "FileUtils";
import "Netmask";
import "NetworkStorage";
+import "Proxy";
import "Installation";
import "String";
import "Mode";
@@ -82,6 +83,7 @@
ReadInstallInfItem(install_inf, "nisdomain", "NISDomain");
ReadInstallInfItem(install_inf, "hostname", "Hostname");
ReadInstallInfItem(install_inf, "module", "Alias");
+ ReadInstallInfItem(install_inf, "proxy", "Proxy");
// ReadInstallInfItem(install_inf, "options", "Options");
ReadInstallInfItem(install_inf, "hwaddr", "HWAddr");
ReadInstallInfItem(install_inf, "ethtool_options", "ethtool");
@@ -91,6 +93,13 @@
ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2");
ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr");
+ ReadInstallInfItem(install_inf, "WlanESSID", "WESSID");
+ ReadInstallInfItem(install_inf, "WlanAuth", "WAuth");
+ ReadInstallInfItem(install_inf, "WlanKey", "WKey");
+ ReadInstallInfItem(install_inf, "WlanKeyType", "WkeyType");
+ ReadInstallInfItem(install_inf, "WlanKeyLen", "WkeyLen");
+
+
/* Split network device */
string netdevice = InstallInf["netdevice"]:"";
if(netdevice != "") {
@@ -184,10 +193,21 @@
SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp");
}
+ // wlan devices
+ if (size(InstallInf["WESSID"]:"")>0 || size(InstallInf["WAuth"]:"")>0 || size(InstallInf["WKey"]:"")>0 || size(InstallInf["WKeyType"]:"")>0 || size(InstallInf["WKeyLen"]:"")>0){
+ network_configuration = sformat("%1WIRELESS_ESSID='%2'\n", network_configuration, InstallInf["WESSID"]:"");
+ network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:"");
+ network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:"");
+ network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration, InstallInf["WKeyLen"]:"");
+ if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0)
+ network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration, substring(InstallInf["WKeyType"]:"", 0, 1), InstallInf["WKey"]:"");
+ }
+
+
// if available, write MTU
if (size(InstallInf["mtu"]:"")>0) network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:"");
-
+ // for queth devices (s390)
if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:"");
@@ -243,12 +263,28 @@
} else y2warning("No routing information in install.inf");
// create resolv.conf only for static configuration
- if (size(InstallInf["domain"]:"")>0 && size(InstallInf["nameserver"]:"")>0){
- string text=sformat("domain %1\nnameserver %2\n", InstallInf["domain"]:"", InstallInf["nameserver"]:"");
+ if (size(InstallInf["nameserver"]:"")>0){
+ string text = "";
+ //Enter search domain data only if present
+ if( size(InstallInf["domain"]:"") > 0)
+ text=sformat("search %1\nnameserver %2\n", InstallInf["domain"]:"", InstallInf["nameserver"]:"");
+ else
+ //If we don't have search domain data, skip 'search' field,
+ //do not leave out 'nameserver' completely - #298001
+ text = sformat("nameserver %1\n", InstallInf["nameserver"]:"");
y2milestone("Write resolv.conf content: %1", text);
SCR::Write(.target.string, "/etc/resolv.conf", text);
}
}
+
+ // create proxy sysconfig file
+ if (size(InstallInf["proxy"]:"")>0) {
+ y2milestone("Writing proxy settings: %1", InstallInf["proxy"]:"");
+ map ex = Proxy::Export();
+ Proxy::Read();
+ Proxy::Import( ex );
+ Proxy::Write();
+ }
// create defaultdomain
if (size(InstallInf["nisdomain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){
y2milestone("Write defaultdomain: %1", InstallInf["nisdomain"]:"");
@@ -292,7 +328,7 @@
WFM::Execute(.local.bash, "udevtrigger --subsystem-match=net");
WFM::Execute (.local.bash, sformat (
- "mkdir -p '%2%1'; /bin/cp -p %1/70-persistent-net.rules'%2%1'",
+ "mkdir -p '%2%1'; /bin/cp -p %1/70-persistent-net.rules '%2%1'",
"/etc/udev/rules.d",
String::Quote (Installation::destdir)));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/config/Makefile.in new/yast2-network-2.15.74/src/config/Makefile.in
--- old/yast2-network-2.15.72/src/config/Makefile.in 2007-09-03 14:28:41.000000000 +0200
+++ new/yast2-network-2.15.74/src/config/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -191,9 +191,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/config/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/config/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/config/Makefile
+ $(AUTOMAKE) --gnu src/config/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/dsl/Makefile.in new/yast2-network-2.15.74/src/dsl/Makefile.in
--- old/yast2-network-2.15.72/src/dsl/Makefile.in 2007-09-03 14:28:41.000000000 +0200
+++ new/yast2-network-2.15.74/src/dsl/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -188,9 +188,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/dsl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/dsl/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/dsl/Makefile
+ $(AUTOMAKE) --gnu src/dsl/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/installation/inst_do_net_test.ycp new/yast2-network-2.15.74/src/installation/inst_do_net_test.ycp
--- old/yast2-network-2.15.72/src/installation/inst_do_net_test.ycp 2007-08-10 17:24:03.000000000 +0200
+++ new/yast2-network-2.15.74/src/installation/inst_do_net_test.ycp 2007-09-05 14:48:53.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec <msvec@xxxxxxx>
* Arvin Schnell <arvin@xxxxxxx>
*
- * $Id: inst_do_net_test.ycp 40095 2007-08-08 13:56:07Z mzugec $
+ * $Id: inst_do_net_test.ycp 40755 2007-09-05 08:55:39Z kmachalkova $
*/
{
@@ -371,7 +371,7 @@
}
//Include also proxy option (if applicable) - #162800, #260407
- string cmd = " /usr/bin/curl -s -S -v -f -m 300" + proxy + " " + url + " -o " + filename;
+ string cmd = " /usr/bin/curl -s -S -v -f -m 300 " + proxy + " " + url + " -o " + filename;
cmd = cmd + " > " + logdir + "/" + log_filename + " 2>&1";
// env["LANG"] = GetLanguageUTF8 ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/installation/Makefile.in new/yast2-network-2.15.74/src/installation/Makefile.in
--- old/yast2-network-2.15.72/src/installation/Makefile.in 2007-09-03 14:28:41.000000000 +0200
+++ new/yast2-network-2.15.74/src/installation/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -215,9 +215,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/installation/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/installation/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/installation/Makefile
+ $(AUTOMAKE) --gnu src/installation/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/isdn/Makefile.in new/yast2-network-2.15.74/src/isdn/Makefile.in
--- old/yast2-network-2.15.72/src/isdn/Makefile.in 2007-09-03 14:28:41.000000000 +0200
+++ new/yast2-network-2.15.74/src/isdn/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -188,9 +188,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/isdn/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/isdn/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/isdn/Makefile
+ $(AUTOMAKE) --gnu src/isdn/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/lan/address.ycp new/yast2-network-2.15.74/src/lan/address.ycp
--- old/yast2-network-2.15.72/src/lan/address.ycp 2007-08-13 18:37:59.000000000 +0200
+++ new/yast2-network-2.15.74/src/lan/address.ycp 2007-09-06 14:14:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: address.ycp 40215 2007-08-10 18:32:35Z kmachalkova $
+ * $Id: address.ycp 40780 2007-09-06 12:14:17Z mzugec $
*/
{
@@ -792,7 +792,7 @@
"validate_type": `function,
"validate_function": ValidateDialog,
"store" : StoreAddrWidget,
- `abort : ReallyAbort,
+ `abort : LanItems::Rollback,
];
@@ -861,11 +861,17 @@
/* Address dialog caption */
"caption": _("Network Card Setup"),
"back_button" : Label::BackButton (),
+ "abort_button" : Label::CancelButton (),
"next_button" : Label::NextButton (),
"fallback_functions" : functions,
]);
+ Wizard::RestoreAbortButton();
+ if (LanItems::operation!=`add) Wizard::DisableBackButton ();
+
y2milestone ("ShowAndRun: %1", ret);
+ if (ret==`abort) LanItems::Rollback();
+
if (ret != `back && ret != `abort)
{
string ifcfgname = NetworkDevices::device_name (
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/lan/complex.ycp new/yast2-network-2.15.74/src/lan/complex.ycp
--- old/yast2-network-2.15.72/src/lan/complex.ycp 2007-08-24 16:37:35.000000000 +0200
+++ new/yast2-network-2.15.74/src/lan/complex.ycp 2007-09-06 14:25:47.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: complex.ycp 40455 2007-08-24 12:42:28Z kmachalkova $
+ * $Id: complex.ycp 40782 2007-09-06 12:25:44Z mzugec $
*/
{
@@ -136,6 +136,7 @@
LanItems::SelectHWMap(LanItems::getCurrentItem()["hwinfo"]:$[]);
LanItems::Items[LanItems::current, "ifcfg"] = LanItems::getCurrentItem()["hwinfo", "dev_name"]:"";
+ LanItems::Items[LanItems::current, "commited"] = false;
LanItems::operation = `edit;
// LanItems::SetDefaultsForHW ();
@@ -458,9 +459,8 @@
Wizard::SetContentsButtons(caption, contents, help, Label::BackButton (), Label::FinishButton ());
Wizard::DisableBackButton();
-
+ if (Mode::installation()) Wizard::SetNextButton (`next, Label::AcceptButton());
symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]);
-
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/lan/hardware.ycp new/yast2-network-2.15.74/src/lan/hardware.ycp
--- old/yast2-network-2.15.72/src/lan/hardware.ycp 2007-08-24 16:43:23.000000000 +0200
+++ new/yast2-network-2.15.74/src/lan/hardware.ycp 2007-09-06 14:14:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hardware dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: hardware.ycp 40477 2007-08-24 14:37:45Z mzugec $
+ * $Id: hardware.ycp 40780 2007-09-06 12:14:17Z mzugec $
*/
{
@@ -346,9 +346,11 @@
symbol handleHW (string key, map event) {
+ if (event["ID"]:nil==`cancel) LanItems::Rollback();
symbol ret=nil;
if (event["EventReason"]:"" == "ValueChanged" || event["EventReason"]:"" == "Activated") ret = (symbol)event["WidgetID"]:nil;
if (ret == `list) SelectionDialog();
+// if (ret == `abort) LanItems::Rollback();
if(ret == `pcmcia || ret == `usb || ret == `dev) {
@@ -439,15 +441,13 @@
LanItems::type = (string) UI::QueryWidget(`id(`dev), `Value);
string nm = (string) UI::QueryWidget(`id(`num), `Value);
string name=NetworkDevices::device_name(LanItems::type, nm);
-// if( hardware["device"]:"" != LanItems::device ) {
if(contains(NetworkDevices::List(""), name)) {
Popup::Error(sformat(_("Configuration name %1 (%2) already exists.
Choose a different one."), nm, NetworkDevices::device_name(hardware["type"]:"", nm)));
UI::SetFocus(`id(`num));
}
-// }
NetworkDevices::Name = name;
- LanItems::Items[LanItems::current]= $["ifcfg":name];
+ LanItems::Items[LanItems::current, "ifcfg"]= name;
}
LanItems::setDriver((string) UI::QueryWidget(`modul, `Value));
@@ -770,8 +770,15 @@
string help = CWM::MergeHelps(w);
contents = CWM::PrepareDialog(contents, w);
- Wizard::SetContentsButtons(caption, contents, "",Label::BackButton(), Label::NextButton());
- return CWM::Run(w, $[`abort:ReallyAbort ]);
+
+ Wizard::OpenNextBackDialog();
+ Wizard::SetContents(caption, contents, "",false, true);
+ Wizard::SetAbortButton(`cancel, Label::CancelButton());
+// Wizard::DisableBackButton();
+ any ret = CWM::Run(w, $[ /*`abort:ReallyAbort*/ ]);
+ Wizard::CloseDialog();
+// Wizard::RestoreAbortButton();
+ return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/lan/Makefile.in new/yast2-network-2.15.74/src/lan/Makefile.in
--- old/yast2-network-2.15.72/src/lan/Makefile.in 2007-09-03 14:28:42.000000000 +0200
+++ new/yast2-network-2.15.74/src/lan/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -188,9 +188,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lan/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lan/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/lan/Makefile
+ $(AUTOMAKE) --gnu src/lan/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/lan/wizards.ycp new/yast2-network-2.15.74/src/lan/wizards.ycp
--- old/yast2-network-2.15.72/src/lan/wizards.ycp 2007-08-10 17:24:04.000000000 +0200
+++ new/yast2-network-2.15.74/src/lan/wizards.ycp 2007-09-06 14:14:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network cards configuration wizards
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: wizards.ycp 39111 2007-07-02 14:53:49Z mzugec $
+ * $Id: wizards.ycp 40780 2007-09-06 12:14:17Z mzugec $
*/
{
@@ -162,11 +162,11 @@
map sequence = $[
"ws_start" : ws_start,
"hardware" : $[
- `abort : `abort,
+ `abort : `back,
`next : "address",
],
"address" : $[
- `abort : `abort,
+ `abort : `back,
`next : `next,
],
"s390" : $[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/Makefile.in new/yast2-network-2.15.74/src/Makefile.in
--- old/yast2-network-2.15.72/src/Makefile.in 2007-09-03 14:28:41.000000000 +0200
+++ new/yast2-network-2.15.74/src/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -189,9 +189,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/Makefile
+ $(AUTOMAKE) --gnu src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/modem/Makefile.in new/yast2-network-2.15.74/src/modem/Makefile.in
--- old/yast2-network-2.15.72/src/modem/Makefile.in 2007-09-03 14:28:42.000000000 +0200
+++ new/yast2-network-2.15.74/src/modem/Makefile.in 2007-09-06 16:19:35.000000000 +0200
@@ -188,9 +188,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modem/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modem/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/modem/Makefile
+ $(AUTOMAKE) --gnu src/modem/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/modules/LanItems.ycp new/yast2-network-2.15.74/src/modules/LanItems.ycp
--- old/yast2-network-2.15.72/src/modules/LanItems.ycp 2007-08-30 15:43:38.000000000 +0200
+++ new/yast2-network-2.15.74/src/modules/LanItems.ycp 2007-09-06 15:24:02.000000000 +0200
@@ -147,7 +147,7 @@
if (hasAnyValue(Items[key, "udev", "driver"]:""))
udev_drivers_rules[Items[key, "udev", "driver"]:""] = [ sformat("ENV{MODALIAS}==\"%1\"", Items[key, "hwinfo", "modalias"]:""), sformat("ENV{MODALIAS}=\"%1\"", Items[key, "udev", "driver"]:"") ];
});
-y2internal("%1", udev_drivers_rules);
+ y2milestone("write udev rules: %1", udev_drivers_rules);
SCR::Write(.udev_persistent.drivers, udev_drivers_rules);
}
@@ -184,6 +184,7 @@
global void AddNew(){
current = size(Items);
+ Items[current] = $["commited":false];
operation = `add;
}
@@ -219,16 +220,24 @@
global void ReadNetworkModules(){
}
+// get list of all configurations for "netcard" macro in NetworkDevices module
+list<string> getNetworkDevices(){
+ list<string> confs=[];
+ map <string, any> configurations = NetworkDevices::FilterDevices("netcard");
+ foreach(string devtype, splitstring(NetworkDevices::CardRegex["netcard"]:"", "|"), {
+ foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), {
+ confs = add(confs, NetworkDevices::device_name(devtype, devnum));
+ });
+ });
+ return confs;
+}
+
global void ReadNetworkInterfaces(){
NetworkDevices::Read();
NetworkDevices::CleanHotplugSymlink();
// match configurations to Items list with hwinfo
- map <string, any> configurations = NetworkDevices::FilterDevices("netcard");
- foreach(string devtype, splitstring(NetworkDevices::CardRegex["netcard"]:"", "|"), {
- foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), {
- string confname = NetworkDevices::device_name(devtype, devnum);
-
+ foreach(string confname, getNetworkDevices(), {
integer pos = nil;
map<string, any> val = $[];
foreach(integer key, map<string, any> value, (map<integer, map<string, any> >)Items, {
@@ -243,28 +252,21 @@
}
Items[pos, "ifcfg"] = confname;
});
- });
// add to Items also virtual devices (configurations) without hwinfo
-
- foreach(string devtype, splitstring(NetworkDevices::CardRegex["netcard"]:"", "|"), {
- 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), {
+ foreach(string confname, getNetworkDevices(), {
boolean already = false;
foreach(integer key, (list<integer>)Map::Keys(Items), {
- if (NetworkDevices::device_name(devtype, devnum) == Items[key, "ifcfg"]:""){
+ if (confname == Items[key, "ifcfg"]:""){
already = true;
break;
};
});
if (!already){
AddNew();
- Items[current] = $["ifcfg":NetworkDevices::device_name(devtype, devnum)];
+ Items[current] = $["ifcfg":confname];
}
});
- });
y2milestone("Read Configuration LanItems::Items %1", Items);
}
@@ -566,7 +568,7 @@
* must be in sync with @ref GetDefaultsForHW
*/
global define void SetDefaultsForHW () {
-y2internal("SetDefaultsForHW type %1", type);
+ y2milestone("SetDefaultsForHW type %1", type);
if (type == "wlan")
{
usercontrol = true;
@@ -1055,6 +1057,19 @@
return true;
}
+global boolean Rollback(){
+ if(getCurrentItem()["commited"]:true==false){
+ y2milestone("rollback item %1", current);
+ if (!(size(getCurrentItem()["hwinfo"]:$[])>0)) Items = remove(Items, current);
+ else{
+ if (haskey(Items[current]:$[], "ifcfg"))
+ if (!contains(getNetworkDevices(), getCurrentItem()["ifcfg"]:""))
+ Items[current]=remove(Items[current]:$[], "ifcfg");
+ }
+ };
+ return true;
+}
+
/**
* Get the module configuration for the modules configured in the
* interface section
@@ -1236,7 +1251,7 @@
}
global void DeleteItem(){
- y2internal("deleting ... %1", Items[current]:$[]);
+ y2milestone("deleting ... %1", Items[current]:$[]);
string ifcfg = Items[current, "ifcfg"]:"";
string hwcfg = Items[current, "hwcfg"]:"";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/modules/Makefile.in new/yast2-network-2.15.74/src/modules/Makefile.in
--- old/yast2-network-2.15.72/src/modules/Makefile.in 2007-09-03 14:28:42.000000000 +0200
+++ new/yast2-network-2.15.74/src/modules/Makefile.in 2007-09-06 16:19:36.000000000 +0200
@@ -207,9 +207,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/modules/Makefile
+ $(AUTOMAKE) --gnu src/modules/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/provider/Makefile.in new/yast2-network-2.15.74/src/provider/Makefile.in
--- old/yast2-network-2.15.72/src/provider/Makefile.in 2007-09-03 14:28:42.000000000 +0200
+++ new/yast2-network-2.15.74/src/provider/Makefile.in 2007-09-06 16:19:36.000000000 +0200
@@ -188,9 +188,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/provider/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/provider/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/provider/Makefile
+ $(AUTOMAKE) --gnu src/provider/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/remote/Makefile.in new/yast2-network-2.15.74/src/remote/Makefile.in
--- old/yast2-network-2.15.72/src/remote/Makefile.in 2007-09-03 14:28:42.000000000 +0200
+++ new/yast2-network-2.15.74/src/remote/Makefile.in 2007-09-06 16:19:36.000000000 +0200
@@ -188,9 +188,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/remote/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/remote/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/remote/Makefile
+ $(AUTOMAKE) --gnu src/remote/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/routines/Makefile.in new/yast2-network-2.15.74/src/routines/Makefile.in
--- old/yast2-network-2.15.72/src/routines/Makefile.in 2007-09-03 14:28:42.000000000 +0200
+++ new/yast2-network-2.15.74/src/routines/Makefile.in 2007-09-06 16:19:36.000000000 +0200
@@ -188,9 +188,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/routines/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/routines/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/routines/Makefile
+ $(AUTOMAKE) --gnu src/routines/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/src/services/Makefile.in new/yast2-network-2.15.74/src/services/Makefile.in
--- old/yast2-network-2.15.72/src/services/Makefile.in 2007-09-03 14:28:42.000000000 +0200
+++ new/yast2-network-2.15.74/src/services/Makefile.in 2007-09-06 16:19:36.000000000 +0200
@@ -188,9 +188,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/services/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/services/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/services/Makefile
+ $(AUTOMAKE) --gnu src/services/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/testsuite/Makefile.in new/yast2-network-2.15.74/testsuite/Makefile.in
--- old/yast2-network-2.15.72/testsuite/Makefile.in 2007-09-03 14:28:43.000000000 +0200
+++ new/yast2-network-2.15.74/testsuite/Makefile.in 2007-09-06 16:19:36.000000000 +0200
@@ -183,9 +183,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign testsuite/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign testsuite/Makefile
+ $(AUTOMAKE) --gnu testsuite/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/testsuite/tests/Proxy.out new/yast2-network-2.15.74/testsuite/tests/Proxy.out
--- old/yast2-network-2.15.72/testsuite/tests/Proxy.out 2007-09-03 09:35:12.000000000 +0200
+++ new/yast2-network-2.15.74/testsuite/tests/Proxy.out 2007-09-05 14:48:53.000000000 +0200
@@ -6,9 +6,9 @@
Read .sysconfig.proxy.NO_PROXY nil
Read .sysconfig.proxy.PROXY_ENABLED nil
Read .target.size "/root/.curlrc" 1
-Read .root.curlrc."--proxy-user" nil
+Read .root.curlrc."--proxy-user" "user:pass"
Return true
Dump Write
Dump Import
Dump Export
-Return $["enabled":true, "ftp_proxy":"f", "http_proxy":"h", "https_proxy":"h", "no_proxy":"", "proxy_password":"", "proxy_user":""]
+Return $["enabled":true, "ftp_proxy":"f", "http_proxy":"h", "https_proxy":"h", "no_proxy":"", "proxy_password":"pass", "proxy_user":"user"]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/testsuite/tests/Proxy.ycp new/yast2-network-2.15.74/testsuite/tests/Proxy.ycp
--- old/yast2-network-2.15.72/testsuite/tests/Proxy.ycp 2007-08-10 17:24:04.000000000 +0200
+++ new/yast2-network-2.15.74/testsuite/tests/Proxy.ycp 2007-09-05 14:48:53.000000000 +0200
@@ -5,7 +5,7 @@
map READ = $[
"root" : $[
"curlrc" : $[
- "proxy-user" : "user:pass",
+ "--proxy-user" : "user:pass",
],
],
"sysconfig" : $[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.72/VERSION new/yast2-network-2.15.74/VERSION
--- old/yast2-network-2.15.72/VERSION 2007-09-03 14:43:36.000000000 +0200
+++ new/yast2-network-2.15.74/VERSION 2007-09-06 14:05:16.000000000 +0200
@@ -1 +1 @@
-2.15.72
+2.15.74
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |