Hello community, here is the log from the commit of package yast2-scanner checked in at Wed Apr 18 01:34:01 CEST 2007. -------- --- yast2-scanner/yast2-scanner.changes 2007-01-29 15:05:54.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-scanner/yast2-scanner.changes 2007-04-17 15:09:35.852685000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 17 14:33:29 CEST 2007 - jsmeix@suse.de + +- V 2.15.1 +- Added test for Package::Available == nil (when there is no + installation source available). + +------------------------------------------------------------------- Old: ---- yast2-scanner-2.15.0.tar.bz2 New: ---- yast2-scanner-2.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-scanner.spec ++++++ --- /var/tmp/diff_new_pack.t18943/_old 2007-04-18 01:31:05.000000000 +0200 +++ /var/tmp/diff_new_pack.t18943/_new 2007-04-18 01:31:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-scanner (Version 2.15.0) +# spec file for package yast2-scanner (Version 2.15.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-scanner -Version: 2.15.0 +Version: 2.15.1 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-scanner-2.15.0.tar.bz2 +Source0: yast2-scanner-2.15.1.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -41,7 +41,7 @@ Johannes Meixner <jsmeix@suse.de> %prep -%setup -n yast2-scanner-2.15.0 +%setup -n yast2-scanner-2.15.1 %build %{prefix}/bin/y2tool y2autoconf @@ -74,7 +74,11 @@ %{prefix}/lib/YaST2/bin/*scanner* %doc %{prefix}/share/doc/packages/yast2-scanner -%changelog -n yast2-scanner +%changelog +* Tue Apr 17 2007 - jsmeix@suse.de +- V 2.15.1 +- Added test for Package::Available == nil (when there is no + installation source available). * Mon Jan 29 2007 - jsmeix@suse.de - V 2.15.0 - Package 'sane' was renamed into 'sane-backends'. ++++++ yast2-scanner-2.15.0.tar.bz2 -> yast2-scanner-2.15.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.15.0/configure new/yast2-scanner-2.15.1/configure --- old/yast2-scanner-2.15.0/configure 2007-01-29 14:50:13.000000000 +0100 +++ new/yast2-scanner-2.15.1/configure 2007-04-17 14:57:19.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-scanner 2.15.0. +# Generated by GNU Autoconf 2.60 for yast2-scanner 2.15.1. # # Report bugs to http://bugs.opensuse.org/. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-scanner' PACKAGE_TARNAME='yast2-scanner' -PACKAGE_VERSION='2.15.0' -PACKAGE_STRING='yast2-scanner 2.15.0' +PACKAGE_VERSION='2.15.1' +PACKAGE_STRING='yast2-scanner 2.15.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -`configure' configures yast2-scanner 2.15.0 to adapt to many kinds of systems. +`configure' configures yast2-scanner 2.15.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-scanner 2.15.0:";; + short | recursive ) echo "Configuration of yast2-scanner 2.15.1:";; esac cat <<_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -yast2-scanner configure 2.15.0 +yast2-scanner configure 2.15.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-scanner $as_me 2.15.0, which was +It was created by yast2-scanner $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-scanner' - VERSION='2.15.0' + VERSION='2.15.1' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.0" +VERSION="2.15.1" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix@suse.de>" @@ -3258,7 +3258,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-scanner $as_me 2.15.0, which was +This file was extended by yast2-scanner $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3301,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\ -yast2-scanner config.status 2.15.0 +yast2-scanner config.status 2.15.1 configured by $0, generated by GNU Autoconf 2.60, with options \"`echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.15.0/configure.in new/yast2-scanner-2.15.1/configure.in --- old/yast2-scanner-2.15.0/configure.in 2007-01-29 14:50:08.000000000 +0100 +++ new/yast2-scanner-2.15.1/configure.in 2007-04-17 14:57:14.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-scanner, 2.15.0, http://bugs.opensuse.org/, yast2-scanner) +AC_INIT(yast2-scanner, 2.15.1, http://bugs.opensuse.org/, yast2-scanner) 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.15.0" +VERSION="2.15.1" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix@suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.15.0/src/Scanner.ycp new/yast2-scanner-2.15.1/src/Scanner.ycp --- old/yast2-scanner-2.15.0/src/Scanner.ycp 2007-01-29 15:03:14.000000000 +0100 +++ new/yast2-scanner-2.15.1/src/Scanner.ycp 2007-04-17 15:09:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Scanner settings, input and output functions * Authors: Johannes Meixner <jsmeix@suse.de> * - * $Id: Scanner.ycp 35679 2007-01-29 14:03:13Z jsmeix $ + * $Id: Scanner.ycp 37513 2007-04-17 13:09:09Z jsmeix $ * * Representation of the configuration of scanner. * Input and output routines. @@ -358,10 +358,22 @@ Report::Error( iscan_message ); return false; } - if( ! Package::Available( package_name ) ) - { y2milestone( "Required package %1 is not installed and not available for installation.", package_name ); + // Is the package available to be installed? + // Package::Available returns nil if no package source is available. + boolean package_available = Package::Available( package_name ); + if( nil == package_available ) + { y2milestone( "Required package %1 is not installed and there is no package installation source available.", package_name ); Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the package name: - _("Required package %1 is not installed and not available for installation."), + _("Required package %1 is not installed and there is no package installation source available."), + package_name + ) + ); + return false; + } + if( ! package_available ) + { y2milestone( "Required package %1 is not installed and not available on the installation source.", package_name ); + Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the package name: + _("Required package %1 is not installed and not available on the installation source."), package_name ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.15.0/VERSION new/yast2-scanner-2.15.1/VERSION --- old/yast2-scanner-2.15.0/VERSION 2007-01-29 14:37:46.000000000 +0100 +++ new/yast2-scanner-2.15.1/VERSION 2007-04-17 14:33:20.000000000 +0200 @@ -1 +1 @@ -2.15.0 +2.15.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org