Hello community,
here is the log from the commit of package yast2-network
checked in at Fri Apr 21 13:04:06 CEST 2006.
--------
--- yast2-network/yast2-network.changes 2006-04-20 18:30:47.000000000 +0200
+++ STABLE/yast2-network/yast2-network.changes 2006-04-21 12:12:56.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Apr 21 12:12:14 CEST 2006 - locilka@suse.cz
+
+- Added missing changes between 2.13.45 and 2.13.46
+- 2.13.47
+
+-------------------------------------------------------------------
+Fri Apr 21 10:00:06 CEST 2006 - locilka@suse.cz
+
+- Prevent from installing older release notes during the internet
+ test. It would fail with useless error message and confuse user.
+ This change enhances behavior of #164388 and fixes (#167985).
+- 2.13.46
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.13.45.tar.bz2
New:
----
yast2-network-2.13.47.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.LqxUnD/_old 2006-04-21 13:02:59.000000000 +0200
+++ /var/tmp/diff_new_pack.LqxUnD/_new 2006-04-21 13:02:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.13.45)
+# spec file for package yast2-network (Version 2.13.47)
#
# 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.45
-Release: 6
+Version: 2.13.47
+Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.13.45.tar.bz2
+Source0: yast2-network-2.13.47.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -49,7 +49,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.13.45
+%setup -n yast2-network-2.13.47
%build
%{prefix}/bin/y2tool y2autoconf
@@ -103,6 +103,14 @@
/usr/share/YaST2/schema/autoyast/rnc/networking.rnc
%changelog -n yast2-network
+* Fri Apr 21 2006 - locilka@suse.cz
+- Added missing changes between 2.13.45 and 2.13.46
+- 2.13.47
+* Fri Apr 21 2006 - locilka@suse.cz
+- Prevent from installing older release notes during the internet
+ test. It would fail with useless error message and confuse user.
+ This change enhances behavior of #164388 and fixes (#167985).
+- 2.13.46
* Thu Apr 20 2006 - sreeves@suse.de
- Fixes were made in gnome-menus so rolling back these redundant changes.
* Wed Apr 19 2006 - sreeves@suse.de
++++++ yast2-network-2.13.45.tar.bz2 -> yast2-network-2.13.47.tar.bz2 ++++++
++++ 6541 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.45/Makefile.am new/yast2-network-2.13.47/Makefile.am
--- old/yast2-network-2.13.45/Makefile.am 2006-04-12 13:48:05.000000000 +0200
+++ new/yast2-network-2.13.47/Makefile.am 2006-04-21 12:13:26.000000000 +0200
@@ -8,6 +8,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -95,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -200,12 +201,12 @@
fi
check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+ $(Y2TOOL) check-textdomain $(srcdir)
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
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.45/VERSION new/yast2-network-2.13.47/VERSION
--- old/yast2-network-2.13.45/VERSION 2006-04-12 13:47:33.000000000 +0200
+++ new/yast2-network-2.13.47/VERSION 2006-04-21 12:12:09.000000000 +0200
@@ -1 +1 @@
-2.13.45
+2.13.47
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.45/configure.in new/yast2-network-2.13.47/configure.in
--- old/yast2-network-2.13.45/configure.in 2006-04-12 13:48:04.000000000 +0200
+++ new/yast2-network-2.13.47/configure.in 2006-04-21 12:13:26.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.13.45, http://www.suse.de/feedback, yast2-network)
+AC_INIT(yast2-network, 2.13.47, http://www.suse.de/feedback, 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.45"
+VERSION="2.13.47"
RPMNAME="yast2-network"
MAINTAINER="Martin Vidner "
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.45/src/installation/inst_do_net_test.ycp new/yast2-network-2.13.47/src/installation/inst_do_net_test.ycp
--- old/yast2-network-2.13.45/src/installation/inst_do_net_test.ycp 2006-04-12 13:24:07.000000000 +0200
+++ new/yast2-network-2.13.47/src/installation/inst_do_net_test.ycp 2006-04-21 10:03:03.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec
* Arvin Schnell
*
- * $Id: inst_do_net_test.ycp 30017 2006-04-12 07:23:28Z locilka $
+ * $Id: inst_do_net_test.ycp 30321 2006-04-21 08:02:58Z locilka $
*/
{
@@ -364,10 +364,47 @@
}
/**
+ * Function checks two versions of installed rpm and decides whether the second one is
+ * newer than the first one. This function ignores non-numerical values in versions
+ *
+ * @param string first version
+ * @param string second version
+ * @return boolean true if the second one is newer than the first one
+ */
+ boolean IsDownloadedVersionNewer (string installed_rpm_version, string downloaded_rpm_version) {
+ list <string> installed_rpm_version_l = filter(string one_item, splitstring(installed_rpm_version, "-\."), {
+ return regexpmatch(one_item, "^[0123456789]+$");
+ });
+ list <string> downloaded_rpm_version_l = filter(string one_item, splitstring(downloaded_rpm_version, "-\."), {
+ return regexpmatch(one_item, "^[0123456789]+$");
+ });
+
+ y2milestone("Evaluating installed %1 and downloaded %2 versions", installed_rpm_version_l, downloaded_rpm_version_l);
+
+ integer installed_version_item = nil;
+ integer downloaded_version_item = nil;
+
+ boolean downloaded_version_is_newer = false;
+ integer loop_counter = 0;
+ foreach (string i_item, installed_rpm_version_l, {
+ installed_version_item = tointeger(i_item);
+ downloaded_version_item = tointeger(downloaded_rpm_version_l[loop_counter]:"0");
+ if (downloaded_version_item > installed_version_item) {
+ downloaded_version_is_newer = true;
+ break;
+ }
+ loop_counter = loop_counter + 1;
+ });
+
+ y2milestone("%1 > %2 -> %3", downloaded_rpm_version, installed_rpm_version, downloaded_version_is_newer);
+ return downloaded_version_is_newer;
+ }
+
+ /**
* Function checks whether the downloaded and installed versions are different
*/
- boolean AreRPMVersionsDifferent(string rpm_name, string disk_file) {
- string query_format = "%{NAME}-%{VERSION}-%{RELEASE}";
+ boolean IsDownloadedRPMInstallable(string rpm_name, string disk_file) {
+ string query_format = "%{NAME}-%{VERSION}";
// Checking the installed version of RPM
map cmd_installed_rpm_version = (map) SCR::Execute(.target.bash_output,
@@ -391,8 +428,8 @@
string downloaded_rpm_version = cmd_downloaded_rpm_version["stdout"]:"undefined-d";
y2milestone("Downloaded version: '%1'", downloaded_rpm_version);
- // The same versions -> false
- return (installed_rpm_version != downloaded_rpm_version);
+ // The same or older versions -> false
+ return IsDownloadedVersionNewer(installed_rpm_version, downloaded_rpm_version);
}
define boolean install_release_notes () {
@@ -412,11 +449,12 @@
}
// Checking whether installed/new rpm versions are different (#164388)
+ // Checking whether the downloaded one is newer (#167985)
string rpm_name = release_notes_rpms[filename]:"";
- if (AreRPMVersionsDifferent(rpm_name, filename)) {
- y2milestone("RPM versions are different");
+ if (IsDownloadedRPMInstallable(rpm_name, filename)) {
+ y2milestone("Downloaded version is newer, let's install it...");
} else {
- y2milestone("RPM versions are not different, skipping...");
+ y2milestone("Downloaded version is the same of older, skipping...");
return;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...