Hello community,
here is the log from the commit of package yast2-packager
checked in at Wed Apr 19 00:58:03 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-04-18 18:49:03.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes 2006-04-19 00:32:10.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Apr 19 00:29:52 CEST 2006 - jsrain@suse.de
+
+- inform in the log that installation was aborted (#157322)
+- 2.13.88
+
+-------------------------------------------------------------------
+Tue Apr 18 20:19:06 CEST 2006 - jsrain@suse.de
+
+- provide function to install add-on products specified on medium
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.87.tar.bz2
New:
----
yast2-packager-2.13.88.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.m8S9Yc/_old 2006-04-19 00:55:00.000000000 +0200
+++ /var/tmp/diff_new_pack.m8S9Yc/_new 2006-04-19 00:55:00.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.87)
+# spec file for package yast2-packager (Version 2.13.88)
#
# 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-packager
-Version: 2.13.87
+Version: 2.13.88
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.87.tar.bz2
+Source0: yast2-packager-2.13.88.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.87
+%setup -n yast2-packager-2.13.88
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,11 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Wed Apr 19 2006 - jsrain@suse.de
+- inform in the log that installation was aborted (#157322)
+- 2.13.88
+* Tue Apr 18 2006 - jsrain@suse.de
+- provide function to install add-on products specified on medium
* Tue Apr 18 2006 - sh@suse.de
- Fixed bug #164869: No dependency check in pattern selector
due to duplicated "Accept" button
++++++ yast2-packager-2.13.87.tar.bz2 -> yast2-packager-2.13.88.tar.bz2 ++++++
++++ 6183 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-packager-2.13.87/Makefile.am new/yast2-packager-2.13.88/Makefile.am
--- old/yast2-packager-2.13.87/Makefile.am 2006-02-01 17:52:53.000000000 +0100
+++ new/yast2-packager-2.13.88/Makefile.am 2006-04-19 00:32:54.000000000 +0200
@@ -137,7 +137,7 @@
$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \
done
-package-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2
+package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2
rm -f package/$(RPMNAME)-*.tar.bz2
rm -f package/*~
rm -f package/*.bak
@@ -145,7 +145,7 @@
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
if ! test -x $(PREFIX)/bin/y2tool; then \
echo "$(PREFIX)/bin/y2tool: not found."; \
- echo "You have to install yast2-devtools to make a package"; \
+ echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-parse check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,6 +199,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
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-packager-2.13.87/VERSION new/yast2-packager-2.13.88/VERSION
--- old/yast2-packager-2.13.87/VERSION 2006-04-18 17:51:59.000000000 +0200
+++ new/yast2-packager-2.13.88/VERSION 2006-04-19 00:30:45.000000000 +0200
@@ -1 +1 @@
-2.13.87
+2.13.88
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-packager-2.13.87/configure.in new/yast2-packager-2.13.88/configure.in
--- old/yast2-packager-2.13.87/configure.in 2006-02-01 17:52:53.000000000 +0100
+++ new/yast2-packager-2.13.88/configure.in 2006-04-19 00:32:54.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.19, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.88, http://www.suse.de/feedback, yast2-packager)
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.19"
+VERSION="2.13.88"
RPMNAME="yast2-packager"
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-packager-2.13.87/src/modules/Packages.ycp new/yast2-packager-2.13.88/src/modules/Packages.ycp
--- old/yast2-packager-2.13.87/src/modules/Packages.ycp 2006-04-18 17:31:09.000000000 +0200
+++ new/yast2-packager-2.13.88/src/modules/Packages.ycp 2006-04-19 00:30:26.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 30183 2006-04-18 14:36:09Z lslezak $
+ * $Id: Packages.ycp 30215 2006-04-18 22:28:33Z jsrain $
*/
{
@@ -32,6 +32,7 @@
import "Label";
import "Wizard";
import "DirInstall";
+ import "PackageCallbacksInit";
global boolean install_sources = false; // Installing source packages ?
global integer timestamp = 0; // last time of getting the target map
@@ -75,6 +76,8 @@
global string add_on_products_list = nil;
+global boolean SelectProduct ();
+
/**
* Reset package selection, but keep objects of specified type
* @param keep a list of symbols specifying type of objects to be kept
@@ -97,6 +100,19 @@
system_packages_selected = false;
}
+/**
+ * Initialize add-on products provided by the installation source
+ */
+global void InitializeAddOnProducts() {
+ if (Packages::add_on_products_list != nil)
+ {
+ y2milestone ("Found list of add-on products to preselect: %1", Packages::add_on_products_list);
+ Packages::SelectProduct ();
+ PackageCallbacksInit::SetMediaCallbacks();
+ AddOnProduct::AddPreselectedAddOnProducts (Packages::add_on_products_list);
+ Packages::add_on_products_list = nil; // do not select them any more
+ }
+}
/*-----------------------------------------------------------------------
@@ -579,7 +595,9 @@
y2milestone( "Setting up the slide directory local copy: %1", our_slidedir);
SlideShow::SetSlideDir (our_slidedir);
- add_on_products_list = Pkg::SourceProvideOptionalFile (initial_source, 1, "/add_on_products");
+ string tmp_add_on_products = Pkg::SourceProvideOptionalFile (initial_source, 1, "/add_on_products");
+ add_on_products_list = ((string)SCR::Read (.target.tmpdir)) + "/add_on_products";
+ WFM::Execute (.local.bash, sformat ("cp %1 %2", tmp_add_on_products, add_on_products_list));
/* Check for Service Pack */
boolean servicepack_available = false;
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-packager-2.13.87/src/modules/SlideShow.ycp new/yast2-packager-2.13.88/src/modules/SlideShow.ycp
--- old/yast2-packager-2.13.87/src/modules/SlideShow.ycp 2006-04-18 17:31:09.000000000 +0200
+++ new/yast2-packager-2.13.88/src/modules/SlideShow.ycp 2006-04-18 23:57:04.000000000 +0200
@@ -696,7 +696,20 @@
language = new_language;
}
+ /**
+ * Append message to the installation log
+ */
+ global void AppendMessageToInstLog (string msg)
+ {
+ string log_line = "\n" + msg;
+ inst_log = inst_log + log_line;
+ if ( ShowingDetails() )
+ {
+ if ( UI::WidgetExists( `instLog ) )
+ UI::ChangeWidget(`instLog, `LastLine, log_line );
+ }
+ }
/**
* Update internal bookkeeping: subtract size of one package from the
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-packager-2.13.87/src/modules/SlideShowCallbacks.ycp new/yast2-packager-2.13.88/src/modules/SlideShowCallbacks.ycp
--- old/yast2-packager-2.13.87/src/modules/SlideShowCallbacks.ycp 2006-04-18 17:31:09.000000000 +0200
+++ new/yast2-packager-2.13.88/src/modules/SlideShowCallbacks.ycp 2006-04-19 00:01:54.000000000 +0200
@@ -56,6 +56,10 @@
{
user_abort = Popup::ConfirmAbort( `incomplete );
}
+ if (user_abort)
+ {
+ SlideShow::AppendMessageToInstLog (_("Aborted"));
+ }
}
else
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...