Hello community,
here is the log from the commit of package yast2-packager
checked in at Tue Jun 6 22:26:18 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-06-06 11:21:40.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-06-06 16:56:15.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 6 16:47:46 CEST 2006 - jsrain@suse.cz
+
+- do not report error if slideshow missing on the media (#182008)
+- 2.13.128
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.127.tar.bz2
New:
----
yast2-packager-2.13.128.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.yu1umT/_old 2006-06-06 22:26:07.000000000 +0200
+++ /var/tmp/diff_new_pack.yu1umT/_new 2006-06-06 22:26:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.127)
+# spec file for package yast2-packager (Version 2.13.128)
#
# 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.127
+Version: 2.13.128
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.127.tar.bz2
+Source0: yast2-packager-2.13.128.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
@@ -43,7 +43,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.127
+%setup -n yast2-packager-2.13.128
%build
%{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,9 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Tue Jun 06 2006 - jsrain@suse.cz
+- do not report error if slideshow missing on the media (#182008)
+- 2.13.128
* Tue Jun 06 2006 - mvidner@suse.cz
- Source synchronization: call rug with --quiet (#179080).
Enable aborting the sync. Increase logging.
++++++ yast2-packager-2.13.127.tar.bz2 -> yast2-packager-2.13.128.tar.bz2 ++++++
++++ 1655 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.127/VERSION new/yast2-packager-2.13.128/VERSION
--- old/yast2-packager-2.13.127/VERSION 2006-06-06 11:19:27.000000000 +0200
+++ new/yast2-packager-2.13.128/VERSION 2006-06-06 16:50:31.000000000 +0200
@@ -1 +1 @@
-2.13.127
+2.13.128
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.127/configure.in new/yast2-packager-2.13.128/configure.in
--- old/yast2-packager-2.13.127/configure.in 2006-06-06 11:22:15.000000000 +0200
+++ new/yast2-packager-2.13.128/configure.in 2006-06-06 16:55:25.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.127, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.13.128, http://bugs.opensuse.org/, 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.127"
+VERSION="2.13.128"
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.127/src/modules/Packages.ycp new/yast2-packager-2.13.128/src/modules/Packages.ycp
--- old/yast2-packager-2.13.127/src/modules/Packages.ycp 2006-06-05 10:28:08.000000000 +0200
+++ new/yast2-packager-2.13.128/src/modules/Packages.ycp 2006-06-06 16:50:04.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 31293 2006-06-02 14:18:41Z lslezak $
+ * $Id: Packages.ycp 31335 2006-06-06 14:50:00Z jsrain $
*/
{
@@ -597,7 +597,11 @@
string datadir = productmap["datadir"]:"suse";
// FIXME: this is optional
string slidedir_find = "/" + datadir + "/setup/slide";
- string slidedir = Pkg::SourceProvideDir( initial_source, 1, slidedir_find );
+ string dir = Pkg::SourceProvideOptionalFile (initial_source, 1,
+ slidedir_find + "/directory.yast");
+ string slidedir = nil;
+ if (dir != nil)
+ slidedir = Pkg::SourceProvideDir( initial_source, 1, slidedir_find );
string our_slidedir = (string)WFM::Read( .local.tmpdir, "" );
if (slidedir == nil) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org