Hello community,
here is the log from the commit of package yast2-installation
checked in at Tue Apr 18 11:55:45 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-04-14 22:34:47.000000000 +0200
+++ NOARCH/yast2-installation/yast2-installation.changes 2006-04-18 10:12:24.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 18 10:12:19 CEST 2006 - mvidner@suse.cz
+
+- Skip popup and unnecessary work if there are no online update
+ sources for add-ons (#167233).
+- 2.13.73
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.72.tar.bz2
New:
----
yast2-installation-2.13.73.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.PH5z8r/_old 2006-04-18 11:54:29.000000000 +0200
+++ /var/tmp/diff_new_pack.PH5z8r/_new 2006-04-18 11:54:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.72)
+# spec file for package yast2-installation (Version 2.13.73)
#
# 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-installation
-Version: 2.13.72
+Version: 2.13.73
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.72.tar.bz2
+Source0: yast2-installation-2.13.73.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2 yast2-update
@@ -48,7 +48,7 @@
Arvin Schnell
%prep
-%setup -n yast2-installation-2.13.72
+%setup -n yast2-installation-2.13.73
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,10 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Tue Apr 18 2006 - mvidner@suse.cz
+- Skip popup and unnecessary work if there are no online update
+ sources for add-ons (#167233).
+- 2.13.73
* Fri Apr 14 2006 - jsrain@suse.de
- prevent from changing installation mode and system for update once
it is selected (#165832)
++++++ yast2-installation-2.13.72.tar.bz2 -> yast2-installation-2.13.73.tar.bz2 ++++++
++++ 14382 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-installation-2.13.72/Makefile.am new/yast2-installation-2.13.73/Makefile.am
--- old/yast2-installation-2.13.72/Makefile.am 2006-04-14 22:33:05.000000000 +0200
+++ new/yast2-installation-2.13.73/Makefile.am 2006-04-18 10:12:44.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-installation-2.13.72/VERSION new/yast2-installation-2.13.73/VERSION
--- old/yast2-installation-2.13.72/VERSION 2006-04-14 22:29:27.000000000 +0200
+++ new/yast2-installation-2.13.73/VERSION 2006-04-18 10:10:48.000000000 +0200
@@ -1 +1 @@
-2.13.72
+2.13.73
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-installation-2.13.72/configure.in new/yast2-installation-2.13.73/configure.in
--- old/yast2-installation-2.13.72/configure.in 2006-04-14 22:33:05.000000000 +0200
+++ new/yast2-installation-2.13.73/configure.in 2006-04-18 10:12:43.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.72, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.73, http://www.suse.de/feedback, yast2-installation)
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.72"
+VERSION="2.13.73"
RPMNAME="yast2-installation"
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-installation-2.13.72/control/docs/control-doc.xml new/yast2-installation-2.13.73/control/docs/control-doc.xml
--- old/yast2-installation-2.13.72/control/docs/control-doc.xml 2006-02-02 19:55:05.000000000 +0100
+++ new/yast2-installation-2.13.73/control/docs/control-doc.xml 2005-04-19 15:34:02.000000000 +0200
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 08:25:24 -0600 (Wed, 27 Oct 2004) $
+ $Date: 2004-10-27 16:25:24 +0200 (St, 27 říj 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
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-installation-2.13.72/src/clients/inst_addon_update_sources.ycp new/yast2-installation-2.13.73/src/clients/inst_addon_update_sources.ycp
--- old/yast2-installation-2.13.72/src/clients/inst_addon_update_sources.ycp 2006-04-11 17:27:21.000000000 +0200
+++ new/yast2-installation-2.13.73/src/clients/inst_addon_update_sources.ycp 2006-04-18 10:05:42.000000000 +0200
@@ -47,8 +47,6 @@
string heading = _("Add-On Product Installation");
// feedback message
string message = _("Reading packages available on the installation sources...");
-Popup::ShowFeedback (heading, message);
-
list<string> knownUrls = KnownUrls ();
y2milestone ("sources known: %1", knownUrls);
@@ -60,18 +58,23 @@
list<string> addUrls = filter (string u, updateUrls, ``( ! is_known[u]:false ));
y2milestone ("sources to add: %1", addUrls);
-list<integer> added_ids = [];
-foreach (string u, addUrls, {
- integer srcid = Pkg::SourceCreate (u, "/");
- y2milestone ("got %1 from creating %2", srcid, u);
- added_ids = add (added_ids, srcid);
-});
-
-y2milestone ("syncing to zmd");
-boolean synced = SourceManager::SyncAddedAndDeleted (added_ids, []);
-y2milestone ("sync status: %1", synced);
+if (addUrls != [])
+{
+ Popup::ShowFeedback (heading, message);
+
+ list<integer> added_ids = [];
+ foreach (string u, addUrls, {
+ integer srcid = Pkg::SourceCreate (u, "/");
+ y2milestone ("got %1 from creating %2", srcid, u);
+ added_ids = add (added_ids, srcid);
+ });
+
+ y2milestone ("syncing to zmd");
+ boolean synced = SourceManager::SyncAddedAndDeleted (added_ids, []);
+ y2milestone ("sync status: %1", synced);
-Popup::ClearFeedback ();
+ Popup::ClearFeedback ();
+}
return `auto;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...