commit yast2-online-update

19 May 2006

Hello community,

here is the log from the commit of package yast2-online-update
checked in at Fri May 19 16:51:38 CEST 2006.

--------

--- yast2-online-update/yast2-online-update.changes	2006-05-18 09:23:19.000000000 +0200
+++ yast2-online-update/yast2-online-update.changes	2006-05-19 14:08:41.000000000 +0200
@@ -1,0 +2,6 @@
+Thu May 18 09:27:59 CEST 2006 - jsuchome@suse.cz
+
+- better check for restarted yast during installation (#167561)
+- 2.13.39
+
+-------------------------------------------------------------------

Old:
----
  yast2-online-update-2.13.38.tar.bz2

New:
----
  yast2-online-update-2.13.39.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-online-update.spec ++++++
--- /var/tmp/diff_new_pack.SR9Wg7/_old	2006-05-19 16:51:32.000000000 +0200
+++ /var/tmp/diff_new_pack.SR9Wg7/_new	2006-05-19 16:51:32.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-online-update (Version 2.13.38)
+# spec file for package yast2-online-update (Version 2.13.39)
 #
 # 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-online-update
-Version:        2.13.38
+Version:        2.13.39
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-online-update-2.13.38.tar.bz2
+Source0:        yast2-online-update-2.13.39.tar.bz2
 prefix:		/usr
 BuildRequires:  gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager
 PreReq:         grep sed
@@ -45,7 +45,7 @@
     gs@suse.de
 
 %prep
-%setup -n yast2-online-update-2.13.38
+%setup -n yast2-online-update-2.13.39
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -122,6 +122,9 @@
 
 %changelog -n yast2-online-update
 * Thu May 18 2006 - jsuchome@suse.cz
+- better check for restarted yast during installation (#167561)
+- 2.13.39
+* Thu May 18 2006 - jsuchome@suse.cz
 - do not exit when only packages (and no patches) are selected for
   installation or deletion (#175668)
 - 2.13.38

++++++ yast2-online-update-2.13.38.tar.bz2 -> yast2-online-update-2.13.39.tar.bz2 ++++++
++++   17361 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-online-update-2.13.38/Makefile.am new/yast2-online-update-2.13.39/Makefile.am
--- old/yast2-online-update-2.13.38/Makefile.am	2006-05-17 15:41:30.000000000 +0200
+++ new/yast2-online-update-2.13.39/Makefile.am	2006-03-20 15:06:41.000000000 +0100
@@ -8,7 +8,6 @@
 
 #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)
@@ -96,7 +95,7 @@
 	done
 
 pot:
-	$(Y2TOOL) y2makepot -s $(srcdir)
+	y2tool y2makepot -s $(srcdir)
 
 install-pot: pot
 	@POT_DST=`find -type d -name testsuite -prune , \
@@ -117,7 +116,7 @@
 	fi
 
 spellcheck: pot
-	$(Y2TOOL) pot-spellcheck
+	y2tool pot-spellcheck
 
 # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
 
@@ -144,20 +143,20 @@
 	rm -f package/*.bak
 	rm -f package/*.auto
 	mv $(RPMNAME)-$(VERSION).tar.bz2 package/
-	if ! test -x $(Y2TOOL); then \
-	    echo "$(Y2TOOL): not found."; \
+	if ! test -x $(PREFIX)/bin/y2tool; then \
+	    echo "$(PREFIX)/bin/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"`"; \
-	    $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+	    $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
 	done
 
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
 
-TAGVERSION	 = $(Y2TOOL) tagversion
+TAGVERSION	 = $(PREFIX)/bin/y2tool tagversion
 
 check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
 	if [ -d $(srcdir)/CVS ]; then \
@@ -200,13 +199,10 @@
 		false;							\
 	fi
 
-check-textdomain:
-	$(Y2TOOL) check-textdomain $(srcdir)
-
 stable: checkin-stable
 
 checkin-stable: package
-	$(Y2TOOL) checkin-stable
+	$(PREFIX)/bin/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-online-update-2.13.38/VERSION new/yast2-online-update-2.13.39/VERSION
--- old/yast2-online-update-2.13.38/VERSION	2006-05-18 09:10:33.000000000 +0200
+++ new/yast2-online-update-2.13.39/VERSION	2006-05-18 09:28:11.000000000 +0200
@@ -1 +1 @@
-2.13.38
+2.13.39
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-online-update-2.13.38/configure.in new/yast2-online-update-2.13.39/configure.in
--- old/yast2-online-update-2.13.38/configure.in	2006-05-17 15:41:30.000000000 +0200
+++ new/yast2-online-update-2.13.39/configure.in	2006-03-20 15:06:41.000000000 +0100
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-online-update
 dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-online-update, 2.13.37, http://bugs.opensuse.org/, yast2-online-update)
+AC_INIT(yast2-online-update, 2.13.8, http://www.suse.de/feedback, yast2-online-update)
 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.37"
+VERSION="2.13.8"
 RPMNAME="yast2-online-update"
 MAINTAINER="Michael Radziej <mir@suse.de>"
 
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-online-update-2.13.38/src/inst_you.ycp new/yast2-online-update-2.13.39/src/inst_you.ycp
--- old/yast2-online-update-2.13.38/src/inst_you.ycp	2006-05-18 09:09:08.000000000 +0200
+++ new/yast2-online-update-2.13.39/src/inst_you.ycp	2006-05-18 09:06:43.000000000 +0200
@@ -30,20 +30,12 @@
     boolean after_restart	= false;
     if (FileUtils::Exists (restart_data_file))
     {
-	string contents = (string)SCR::Read (.target.string, restart_data_file);
-	integer step	= tointeger (contents);
-	integer no	= 1;
-	foreach (map mod,
-	    ProductControl::getModules (Stage::stage(), Mode::mode(), `enabled),
+	map restarting_step	= ProductControl::RestartingStep ();
+	if (restarting_step["name"]:"" == "you")
 	{
-		y2internal ("module: %1", mod);
-		after_restart	= true; //FIXME
-		/*
-		if (no == step && mod["name"]:"" == "you")
-		    after_restart	= true;
-		*/
-		no = no + 1;
-	});
+	    y2milestone ("installation restarted from YOU");
+	    after_restart	= true;
+	}
     }
 
     if (!Internet::do_you && !after_restart)	// nothing to do


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)