Hello community, here is the log from the commit of package yast2-network checked in at Wed Sep 12 16:50:41 CEST 2007. -------- --- yast2-network/yast2-network.changes 2007-09-07 13:09:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-09-12 16:40:33.542465000 +0200 @@ -1,0 +2,9 @@ +Wed Sep 12 13:49:17 CEST 2007 - kmachalkova@suse.cz + +- Do not re-add network devices (incl. loopback) into available + devices list each time Lan::Import() is called (#308132) +- Do not rewrite udev rules file during update (if it already exists + in Installation::destdir) (#293366c#7) +- 2.15.76 + +------------------------------------------------------------------- Old: ---- yast2-network-2.15.75.tar.bz2 New: ---- yast2-network-2.15.76.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.R23311/_old 2007-09-12 16:50:19.000000000 +0200 +++ /var/tmp/diff_new_pack.R23311/_new 2007-09-12 16:50:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.15.75) +# spec file for package yast2-network (Version 2.15.76) # # 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.75 +Version: 2.15.76 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.15.75.tar.bz2 +Source0: yast2-network-2.15.76.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.75 +Version: 2.15.76 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.15.75.tar.bz2 +Source0: yast2-network-2.15.76.tar.bz2 prefix: /usr Requires: yast2-network >= 2.15.53 Summary: YaST2 - Developer documentation for yast2-network @@ -73,7 +73,7 @@ Michal Svec <msvec@suse.cz> %prep -%setup -n yast2-network-2.15.75 +%setup -n yast2-network-2.15.76 %build %{prefix}/bin/y2tool y2autoconf @@ -141,6 +141,12 @@ %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog +* Wed Sep 12 2007 - kmachalkova@suse.cz +- Do not re-add network devices (incl. loopback) into available + devices list each time Lan::Import() is called (#308132) +- Do not rewrite udev rules file during update (if it already exists + in Installation::destdir) (#293366c#7) +- 2.15.76 * Fri Sep 07 2007 - mzugec@suse.cz - fixed firmware installation for wlan cards (#307401) - 2.15.75 ++++++ yast2-network-2.15.75.tar.bz2 -> yast2-network-2.15.76.tar.bz2 ++++++ ++++ 6670 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.15.75/configure.in new/yast2-network-2.15.76/configure.in --- old/yast2-network-2.15.75/configure.in 2007-09-07 12:49:24.000000000 +0200 +++ new/yast2-network-2.15.76/configure.in 2007-08-09 17:46:36.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-network dnl -dnl -- This file is generated by y2autoconf 2.15.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.15.74, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.15.57, 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.74" +VERSION="2.15.57" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec@suse.cz>" 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.15.75/Makefile.am new/yast2-network-2.15.76/Makefile.am --- old/yast2-network-2.15.75/Makefile.am 2007-09-07 12:49:25.000000000 +0200 +++ new/yast2-network-2.15.76/Makefile.am 2007-08-09 17:46:36.000000000 +0200 @@ -30,7 +30,7 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip +AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal @@ -210,7 +210,8 @@ # For po/ modules checkpo: - test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo -# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox + test ! -d $(srcdir)/po || $(MAKE) -C po checkpo +# test ! -d $(srcdir)/po \ +# || { $(MAKE) -C po checkpo && $(MAKE) -C po 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 --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.15.75/src/clients/save_network.ycp new/yast2-network-2.15.76/src/clients/save_network.ycp --- old/yast2-network-2.15.75/src/clients/save_network.ycp 2007-09-06 16:16:32.000000000 +0200 +++ new/yast2-network-2.15.76/src/clients/save_network.ycp 2007-09-12 14:11:43.000000000 +0200 @@ -327,10 +327,17 @@ // re-trigger event for net 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'", - "/etc/udev/rules.d", - String::Quote (Installation::destdir))); + string udev_rules_srcdir = "/etc/udev/rules.d"; + string udev_rules_srcfile = "70-persistent-net.rules"; + string udev_rules_destdir = sformat("%1%2", String::Quote (Installation::destdir), udev_rules_srcdir); + + //Do not create udev_rules_destdir if it already exists (in case of update) + //(bug #293366, c#7) + if (! FileUtils::Exists( udev_rules_destdir )) + WFM::Execute (.local.bash, sformat ( + "mkdir -p '%1'; /bin/cp -p '%2/%3' '%1'", + udev_rules_destdir, + udev_rules_srcdir, udev_rules_srcfile)); // close and chroot back WFM::SCRClose (new_SCR); 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.15.75/src/modules/Lan.ycp new/yast2-network-2.15.76/src/modules/Lan.ycp --- old/yast2-network-2.15.75/src/modules/Lan.ycp 2007-08-28 15:22:49.000000000 +0200 +++ new/yast2-network-2.15.76/src/modules/Lan.ycp 2007-09-12 13:45:06.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec@suse.cz> * - * $Id: Lan.ycp 40537 2007-08-28 13:22:01Z mzugec $ + * $Id: Lan.ycp 40866 2007-09-12 11:45:06Z kmachalkova $ * * Representation of the configuration of network cards. * Input and output routines. @@ -467,7 +467,7 @@ */ global define boolean Import(map settings) { - if (Mode::autoinst()) { + if (!Mode::autoinst()) { // FIXME: MOD Modules = (map) eval(settings["modules"]:$[]); NetworkDevices::Import("netcard", (map<string, map>) settings["devices"]:$[]); 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.15.75/VERSION new/yast2-network-2.15.76/VERSION --- old/yast2-network-2.15.75/VERSION 2007-09-07 12:54:52.000000000 +0200 +++ new/yast2-network-2.15.76/VERSION 2007-09-12 13:52:54.000000000 +0200 @@ -1 +1 @@ -2.15.75 +2.15.76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org