Hello community,
here is the log from the commit of package yast2-printer for openSUSE:Factory
checked in at Fri Mar 19 09:24:20 CET 2010.
--------
--- yast2-printer/yast2-printer.changes 2010-01-22 16:35:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2010-03-03 14:46:53.000000000 +0100
@@ -1,0 +2,29 @@
+Wed Mar 3 12:18:38 CET 2010 - jsmeix@suse.de
+
+- Fixed tools/autodetect_print_queues by testing for the
+ positive "lpstat -r" output "scheduler is running"
+ the same way as already implemented in src/Printerlib.ycp
+ (bnc#584540).
+- Fixed testpage printing in overview.ycp:
+ When testpage printing failed, the queue may have
+ become disabled so that a refresh of the overview content
+ is needed (e.g. to show the new queue state).
+ Added support to show the particular logging info
+ in /var/log/cups/error_log for the testpage print job
+ when the user clicked "Testpage printing failed".
+- In CUPS version 1.5 SCSI printer support will be dropped,
+ see http://www.cups.org/str.php?L3500
+ i.e. the CUPS scsi backend will be dropped.
+ Therefore in yast2-printer SCSI printer support is
+ also dropped in connectionwizard.ycp and helps.ycp.
+ Nevertheless because of the dropped scsi backend
+ there is at least a user notification Popup::ErrorDetails
+ if the scsi backend is used for a queue but there
+ is no /usr/lib*/cups/backend/scsi (bnc#580121).
+- In none of the bash scripts for yast2-printer bash globbing
+ is needed. Actually in all those scripts no bash globbing
+ should happen. Therefore I added to all those scripts
+ a "set -f" line (bnc #575056).
+- 2.19.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-printer-2.19.4.tar.bz2
New:
----
yast2-printer-2.19.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.gbhUNu/_old 2010-03-19 09:21:05.000000000 +0100
+++ /var/tmp/diff_new_pack.gbhUNu/_new 2010-03-19 09:21:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.19.4)
+# spec file for package yast2-printer (Version 2.19.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,24 +19,32 @@
Name: yast2-printer
-Version: 2.19.4
+Version: 2.19.5
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.19.4.tar.bz2
+Source0: yast2-printer-2.19.5.tar.bz2
+
Prefix: /usr
+
BuildRequires: update-desktop-files xorg-x11-libX11-devel yast2 yast2-core-devel yast2-devtools yast2-testsuite
+
Recommends: cups-client iptables netcat samba-client
+
Requires: /bin/mktemp /bin/ping /usr/bin/sed
Requires: yast2 >= 2.16.12
+
Provides: yast2-config-cups yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups yast2-trans-printer yast2-trans-libprinter yast2-trans-cups yast2-cups-devel
Obsoletes: yast2-config-cups yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups yast2-trans-printer yast2-trans-libprinter yast2-trans-cups yast2-cups-devel
+
Provides: yast2-agent-cups-devel y2d_prnt y2t_prnt
Obsoletes: yast2-agent-cups-devel y2d_prnt y2t_prnt
+
# Used to exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list
# which are pulled in by Autoreqprov because of the basicadd_displaytest tool:
%define my_requires /tmp/my-requires
+
Summary: YaST2 - Printer Configuration
%package devel-doc
@@ -52,14 +60,16 @@
Developer documentation for yast2-printer.
%prep
-%setup -n yast2-printer-2.19.4
+%setup -n yast2-printer-2.19.5
%build
%{prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake
autoreconf --force --install
+
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
make %{?jobs:-j%jobs}
@@ -71,6 +81,7 @@
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
+
# Exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list
# which are pulled in by Autoreqprov because of the basicadd_displaytest tool:
cat << EOF > %{my_requires}
++++++ yast2-printer-2.19.4.tar.bz2 -> yast2-printer-2.19.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/configure new/yast2-printer-2.19.5/configure
--- old/yast2-printer-2.19.4/configure 2010-01-22 15:22:16.000000000 +0100
+++ new/yast2-printer-2.19.5/configure 2010-03-03 12:35:02.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-printer 2.19.4.
+# Generated by GNU Autoconf 2.63 for yast2-printer 2.19.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-printer'
PACKAGE_TARNAME='yast2-printer'
-PACKAGE_VERSION='2.19.4'
-PACKAGE_STRING='yast2-printer 2.19.4'
+PACKAGE_VERSION='2.19.5'
+PACKAGE_STRING='yast2-printer 2.19.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1336,7 +1336,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-printer 2.19.4 to adapt to many kinds of systems.
+\`configure' configures yast2-printer 2.19.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1407,7 +1407,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-printer 2.19.4:";;
+ short | recursive ) echo "Configuration of yast2-printer 2.19.5:";;
esac
cat <<\_ACEOF
@@ -1502,7 +1502,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-printer configure 2.19.4
+yast2-printer configure 2.19.5
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1516,7 +1516,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-printer $as_me 2.19.4, which was
+It was created by yast2-printer $as_me 2.19.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2363,7 +2363,7 @@
# Define the identity of the package.
PACKAGE='yast2-printer'
- VERSION='2.19.4'
+ VERSION='2.19.5'
cat >>confdefs.h <<_ACEOF
@@ -2587,7 +2587,7 @@
-VERSION="2.19.4"
+VERSION="2.19.5"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
@@ -5413,7 +5413,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-printer $as_me 2.19.4, which was
+This file was extended by yast2-printer $as_me 2.19.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5467,7 +5467,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-printer config.status 2.19.4
+yast2-printer config.status 2.19.5
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/configure.in new/yast2-printer-2.19.5/configure.in
--- old/yast2-printer-2.19.4/configure.in 2010-01-22 15:22:10.000000000 +0100
+++ new/yast2-printer-2.19.5/configure.in 2010-03-03 12:34:57.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-printer, 2.19.4, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.19.5, http://bugs.opensuse.org/, yast2-printer)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.19.4"
+VERSION="2.19.5"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/src/connectionwizard.ycp new/yast2-printer-2.19.5/src/connectionwizard.ycp
--- old/yast2-printer-2.19.4/src/connectionwizard.ycp 2009-12-18 14:30:15.000000000 +0100
+++ new/yast2-printer-2.19.5/src/connectionwizard.ycp 2010-02-16 16:48:57.000000000 +0100
@@ -1093,90 +1093,6 @@
model_content
);
break;
- case(`scsi):
- // Fallback message what the user may run manually when it fails
- // to generate the current list of SCSI generic device nodes:
- string scsi_device_list = _("It seems there are no SCSI generic devices (/dev/sg...).\nRun 'lsscsi -g' to get a list of SCSI generic devices.");
- // Let the whole pipe fail if any of its commands fail (requires bash):
- if( ! Printerlib::ExecuteBashCommand( "set -o pipefail ; lsscsi -g | tr -s ' ' | cut -s -d ' ' -f 3- | grep '/dev/sg' || echo 'no SCSI generic device found' 1>&2" ) )
- { Popup::ErrorDetails( // Popup::ErrorDetails message:
- _("Failed to get a list of SCSI generic devices."),
- "lsscsi -g" + "\n" + Printerlib::result["stderr"]:""
- );
- }
- else
- { if( "" != Printerlib::result["stdout"]:"" )
- { scsi_device_list = Printerlib::result["stdout"]:"";
- }
- }
- y2milestone( "scsi_device_list '%1'", scsi_device_list );
- current_device_uri = getCurrentDeviceURI();
- string current_scsi_device_node = "";
- list <term> scsi_device_node_items = [];
- if( "scsi:/" == substring( current_device_uri, 0, size( "scsi:/" ) ) )
- { // The Device URI has the form:
- // scsi:/dev/sg...
- // remove the scheme 'scsi:' so that only the '/dev/sg...' is left:
- current_scsi_device_node = mergestring( sublist( splitstring( current_device_uri, ":" ), 1 ), "" );
-
- }
- boolean current_scsi_device_node_found = false;
- foreach( string device_node,
- [ "/dev/sg0", "/dev/sg1", "/dev/sg2", "/dev/sg3", "/dev/sg4", "/dev/sg5", "/dev/sg6", "/dev/sg7" ],
- { if( current_scsi_device_node == device_node )
- { current_scsi_device_node_found = true;
- // Have the current scsi device node preselected:
- scsi_device_node_items = add( scsi_device_node_items,
- `item( `id( device_node ), device_node, true )
- );
- }
- else
- { scsi_device_node_items = add( scsi_device_node_items,
- `item( `id( device_node ), device_node )
- );
- }
- }
- );
-
- if( ! current_scsi_device_node_found )
- { if( "" == current_scsi_device_node )
- { // Have an empty entry topmost and preselected to be on the safe side because
- // the CUPS scsi backend may blindly write to any device,
- // (see backend/scsi-linux.c in the CUPS 1.3.9 sources):
- scsi_device_node_items = prepend( scsi_device_node_items, `item( `id(""), "", true ) );
- }
- else
- { // Have the current_scsi_device_node topmost and preselected:
- scsi_device_node_items = prepend( scsi_device_node_items,
- `item( `id( current_scsi_device_node ), current_scsi_device_node, true )
- );
- }
- }
- model_content = getContentFromCurrentModel( true );
- content = `VBox
- ( `Left
- ( `ComboBox
- ( `id(`scsi_device_node),
- `opt(`editable),
- // Label for an editable ComboBox where
- // a SCSI generic device node (e.g. /dev/sg0 or /dev/sg1)
- // can be selected or entered:
- _("&SCSI generic device"),
- scsi_device_node_items
- )
- ),
- `Left
- ( `Frame
- ( // TRANSLATORS: Frame label for a list of SCSI generic devices:
- _("Currently available SCSI generic devices"),
- // The RichText widget is required here to get scroll bars if needed
- // (a Label cuts the content because it does not provide scroll bars):
- `RichText( "<pre>" + scsi_device_list + "</pre>" )
- )
- ),
- model_content
- );
- break;
// network printer
case(`tcp):
hostname = "";
@@ -1988,9 +1904,7 @@
// TRANSLATORS: Tree widget item
`item( `id(`serial), _("Serial Port") ),
// TRANSLATORS: Tree widget item
- `item( `id(`bluetooth), _("Bluetooth") ),
- // TRANSLATORS: Tree widget item
- `item( `id(`scsi), _("SCSI") )
+ `item( `id(`bluetooth), _("Bluetooth") )
]
),
`item
@@ -2108,8 +2022,22 @@
changeSettingsDialog( `bluetooth );
}
else if( "scsi:/" == substring( current_device_uri, 0, size( "scsi:/" ) ) )
- { UI::ChangeWidget( `tree_selection, `CurrentItem, `scsi );
- changeSettingsDialog( `scsi );
+ { // In CUPS 1.5 SCSI printer support will be dropped,
+ // see https://bugzilla.novell.com/show_bug.cgi?id=580121
+ // and http://www.cups.org/str.php?L3500
+ // i.e. the scsi backend will be dropped.
+ // Therefore in yast2-printer SCSI printer support is also dropped.
+ // Because of the dropped scsi backend there must be a user notification:
+ if( ! Printerlib::ExecuteBashCommand( "ls /usr/lib*/cups/backend/scsi" ) )
+ { Popup::ErrorDetails( // Popup::ErrorDetails message:
+ _("In CUPS version 1.5 SCSI printer support is dropped."),
+ // Popup::ErrorDetails details (for experts only):
+ _("An untested and insecure workaround might be\nto set 'FileDevice Yes' in cupsd.conf\nand use a DeviceURI like 'file:/dev/sg...'")
+ );
+ }
+ // In this case "Specify Arbitrary Device URI" is used as fallback:
+ UI::ChangeWidget( `tree_selection, `CurrentItem, `uri );
+ changeSettingsDialog( `uri );
}
else if( "socket:/" == substring( current_device_uri, 0, size( "socket:/" ) ) )
{ UI::ChangeWidget( `tree_selection, `CurrentItem, `tcp );
@@ -2253,19 +2181,6 @@
valid = true;
}
break;
- case(`scsi):
- string scsi_device_node = (string)UI::QueryWidget( `scsi_device_node, `Value );
- if( size( scsi_device_node ) == 0 )
- { Popup::Error( _("SCSI generic device could not be empty.") );
- }
- else
- { // It would be wrong to do URIpercentEncoding(scsi_device_node)
- // because scsi_device_node is e.g. '/dev/sg1' which must stay as is
- // to result a valid 'scsi' URI like 'scsi:/dev/sg1':
- connection_uri = "scsi:" + scsi_device_node;
- valid = true;
- }
- break;
case(`uri):
case(`ipp):
connection_uri = (string)UI::QueryWidget( `uri, `Value );
@@ -2512,7 +2427,6 @@
break;
case(`serial):
case(`bluetooth):
- case(`scsi):
case(`uri):
case(`ipp):
case(`smb):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/src/helps.ycp new/yast2-printer-2.19.5/src/helps.ycp
--- old/yast2-printer-2.19.4/src/helps.ycp 2010-01-21 11:00:26.000000000 +0100
+++ new/yast2-printer-2.19.5/src/helps.ycp 2010-02-16 16:14:19.000000000 +0100
@@ -489,16 +489,14 @@
To access a HP printer or all-in-one device via the backend 'hp',
the RPM package hplip must be installed.
The package provides HP's printing and scanning software HPLIP.<br>
-In contrast devices which are connected via serial port, bluetooth,
-or SCSI are usually not autodetected so that the device URI must be
-manually specified.
+In contrast devices which are connected via serial port or bluetooth
+are not autodetected so that the device URI must be manually specified.
The serial device URI parameters must comply with
what the serial port in the printer requires,
see the manual of your serial printer.
Example device URIs:<br>
serial:/dev/ttyS9?baud=9600+bits=8+parity=none+flow=soft+stop=1<br>
bluetooth://1A2B3C4D5E6F<br>
-scsi:/dev/sg9<br>
To access a device via bluetooth, the RPM package bluez-cups must be installed.
The package provides the CUPS backend 'bluetooth' which actually sends the data
to a bluetooth printer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/src/overview.ycp new/yast2-printer-2.19.5/src/overview.ycp
--- old/yast2-printer-2.19.4/src/overview.ycp 2009-12-18 14:12:50.000000000 +0100
+++ new/yast2-printer-2.19.5/src/overview.ycp 2010-02-18 13:54:12.000000000 +0100
@@ -586,20 +586,29 @@
),
Printerlib::result["stderr"]:""
);
- return nil;
+
+ // When submitting the testpage to the queue failed (also for non-local queues)
+ // there might be whatever reason (e.g. a remote queue might have been deleted in the meantime)
+ // so that a refresh of the overview content is needed to be on the safe side.
+ // Re-run the OverviewDialog (with re-created queue status) via the sequencer:
+ return `refresh;
}
- Popup::TimedAnyQuestion( // Popup::TimedAnyQuestion header:
- _("Wait Until Testprint Finished"),
- // Popup::TimedAnyQuestion message
- // where %1 will be replaced by the queue name.
- sformat( _("Sent testpage to %1. It should start to print soon."), queue_name ),
- // Popup::TimedAnyQuestion 'Yes' button label:
- Label::StopButton(),
- // Popup::TimedAnyQuestion 'No' button label:
- Label::OKButton(),
- `focus_yes,
- 120
- );
+ string test_print_command_stdout = Printerlib::result["stdout"]:"";
+ boolean test_print_success = Popup::AnyQuestion( // Popup::AnyQuestion header regarding testpage printout result:
+ _("Wait Until Testpage Printing Finished"),
+ // Popup::AnyQuestion message regarding testpage printout result
+ // where %1 will be replaced by the queue name.
+ sformat( _("Sent testpage to %1. Printing should start soon."),
+ queue_name
+ ),
+ // Popup::AnyQuestion 'Yes' button label
+ // regarding a positive testpage printout result:
+ _("Testpage printout was successful"),
+ // Popup::AnyQuestion 'No' button label
+ // regarding a negative testpage printout result:
+ _("Testpage printing failed"),
+ `focus_yes
+ );
if( "local" == Printer::queues[selected_queue_index,"config"]:"remote" )
{ // When it is a local queue and there are still pending jobs in the queue,
// it seems something went wrong with the testpage printing
@@ -695,8 +704,62 @@
}
}
}
+ if( ! test_print_success )
+ { // When the user had selected in the Popup::AnyQuestion that "Testpage printing failed"
+ // and when it is a local queue, extract logging information about the test print job
+ // from /var/log/cups/error_log and show them to the user:
+ string test_print_cups_error_log = "";
+ test_print_command_stdout = deletechars( test_print_command_stdout, "'" );
+ Printerlib::ExecuteBashCommand( // sed is greedy and cuts all up to the last '-' for example
+ // echo ' funprinter-1000-123 ' | sed -e 's/.*-//'
+ // so that it works even if there is a '-' in the queue name
+ // which is not allowed but may happen nevertheless, see
+ // http://bugzilla.novell.com/show_bug.cgi?id=556819#c12
+ // and the final tr removes in particular spaces and newline:
+ "echo '"
+ + test_print_command_stdout
+ + "' | grep -o ' "
+ + queue_name
+ + "-[0-9]* ' | sed -e 's/.*-//' | tr -d -c '[:digit:]'"
+ );
+ string test_print_job_number = Printerlib::result["stdout"]:"";
+ if( "" != test_print_job_number )
+ { // Note the YCP quoting: \\ becomes \ in the commandline:
+ Printerlib::ExecuteBashCommand( "grep '\\[Job "
+ + test_print_job_number
+ + "\\]' /var/log/cups/error_log | grep -v '^[dD]'"
+ );
+ test_print_cups_error_log = Printerlib::result["stdout"]:"";
+ }
+ // Ignore an effectively empty test_print_cups_error_log:
+ if( "" != filterchars( test_print_cups_error_log, Printer::alnum_chars ) )
+ { // Whereto find the full CUPS log information when "Testpage printing failed":
+ string where_full_log = _("For the full log, see the /var/log/cups/error_log file.");
+ Popup::AnyMessage( sformat( // Header of a Popup::AnyMessage where %1 will be replaced by the queue name:
+ _("CUPS log information while processing the testpage for %1 (English only)"),
+ queue_name
+ ),
+ test_print_cups_error_log
+ + "\n----------------------------------------------------------------------\n"
+ + where_full_log
+ );
+ }
+ }
+ }
+ else
+ { // It is a non-local queue:
+ if( ! test_print_success )
+ { Popup::Notify( // When the user had selected that "Testpage printing failed" for a non-local queue
+ // show a very generic info to the user to show at least something:
+ _( "When printing via a remote system fails, you may ask an admin of the remote system." )
+ );
+ }
}
- return nil;
+ // While testpage printing the backend may have failed (also for non-local queues)
+ // e.g. exited with exit code 1 (CUPS_BACKEND_FAILED) or 4 (CUPS_BACKEND_STOP)
+ // which disables the queue so that a refresh of the overview content is needed.
+ // Re-run the OverviewDialog (with re-created queue status) via the sequencer:
+ return `refresh;
}
if( `add == event["ID"]:nil && "Activated" == event["EventReason"]:"" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/src/wizards.ycp new/yast2-printer-2.19.5/src/wizards.ycp
--- old/yast2-printer-2.19.4/src/wizards.ycp 2009-12-22 12:33:56.000000000 +0100
+++ new/yast2-printer-2.19.5/src/wizards.ycp 2010-02-17 15:32:36.000000000 +0100
@@ -65,6 +65,7 @@
`add : "add",
`modify : "modify",
`delete : "overview",
+ `refresh : "overview",
`printing_via_network_back : "overview",
`printing_via_network_next : "overview",
`printing_via_network_connection_wizard : "printing_via_network_connection_wizard",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/autodetect_printers new/yast2-printer-2.19.5/tools/autodetect_printers
--- old/yast2-printer-2.19.4/tools/autodetect_printers 2009-11-26 15:55:27.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/autodetect_printers 2010-01-29 14:45:04.000000000 +0100
@@ -1,13 +1,16 @@
#! /bin/bash
#
-# Johannes Meixner , 2007, 2008, 2009
+# Johannes Meixner , 2007, 2008, 2009, 2010
#set -x
+# Make sure to have a clean environment:
export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
# This file name for a progress indicator is also used in Printer.ycp:
test -z "$PROGRESS" && PROGRESS="/var/lib/YaST2/autodetect_printers.progress"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/autodetect_print_queues new/yast2-printer-2.19.5/tools/autodetect_print_queues
--- old/yast2-printer-2.19.4/tools/autodetect_print_queues 2009-11-24 16:25:57.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/autodetect_print_queues 2010-03-02 11:36:47.000000000 +0100
@@ -1,13 +1,16 @@
#! /bin/bash
#
-# Johannes Meixner , 2007, 2008, 2009
+# Johannes Meixner , 2007, 2008, 2009, 2010
#set -x
+# Make sure to have a clean environment:
export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
MY_NAME=${0##*/}
@@ -40,7 +43,7 @@
fi
# Since CUPS 1.4 'lpstat -r' results true even when scheduler is not running.
# Therefore we must now grep in its output:
-if $LPSTAT -h $SERVERNAME -r | grep -q 'scheduler is not running'
+if ! $LPSTAT -h $SERVERNAME -r | grep -q 'scheduler is running'
then echo "Cannot access cupsd on '$SERVERNAME'" 1>&2
exit 2
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/create_printer_ppd_database new/yast2-printer-2.19.5/tools/create_printer_ppd_database
--- old/yast2-printer-2.19.4/tools/create_printer_ppd_database 2009-10-29 12:29:33.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/create_printer_ppd_database 2010-01-29 14:45:04.000000000 +0100
@@ -1,13 +1,16 @@
#! /bin/bash
#
-# Johannes Meixner , 2007, 2008, 2009
+# Johannes Meixner , 2007, 2008, 2009, 2010
#set -x
+# Make sure to have a clean environment:
export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
# This file name for a progress indicator is also used in Printer.ycp:
test -z "$PROGRESS" && PROGRESS="/var/lib/YaST2/create_printer_ppd_database.progress"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/cups_client_only new/yast2-printer-2.19.5/tools/cups_client_only
--- old/yast2-printer-2.19.4/tools/cups_client_only 2009-10-29 12:29:33.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/cups_client_only 2010-01-29 14:45:04.000000000 +0100
@@ -1,13 +1,16 @@
#! /bin/bash
#
-# Johannes Meixner , 2007, 2008, 2009
+# Johannes Meixner , 2007, 2008, 2009, 2010
#set -x
+# Make sure to have a clean environment:
export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
# When 'localhost' or its IP-address is to be set,
# it is unified so that only 'localhost' or '127.0.0.1' are set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/determine_printer_driver_options new/yast2-printer-2.19.5/tools/determine_printer_driver_options
--- old/yast2-printer-2.19.4/tools/determine_printer_driver_options 2009-10-29 12:29:33.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/determine_printer_driver_options 2010-01-29 14:45:04.000000000 +0100
@@ -1,13 +1,16 @@
#! /bin/bash
#
-# Johannes Meixner , 2007, 2008, 2009
+# Johannes Meixner , 2007, 2008, 2009, 2010
#set -x
+# Make sure to have a clean environment:
export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
MY_NAME=${0##*/}
QUEUE="$1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/modify_cupsd_conf new/yast2-printer-2.19.5/tools/modify_cupsd_conf
--- old/yast2-printer-2.19.4/tools/modify_cupsd_conf 2009-11-06 15:48:22.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/modify_cupsd_conf 2010-01-29 14:45:04.000000000 +0100
@@ -1,13 +1,16 @@
#! /bin/bash
#
-# Johannes Meixner , 2007, 2008, 2009
+# Johannes Meixner , 2007, 2008, 2009, 2010
#set -x
+# Make sure to have a clean environment:
export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
MY_NAME=${0##*/}
CUPSDCONF="/etc/cups/cupsd.conf"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/test_device new/yast2-printer-2.19.5/tools/test_device
--- old/yast2-printer-2.19.4/tools/test_device 2009-10-29 12:29:33.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/test_device 2010-01-29 14:45:04.000000000 +0100
@@ -6,15 +6,18 @@
# 2 problems while writing to $2
#
# Jan Holesovsky , 2000
-# Johannes Meixner , 2008
+# Johannes Meixner , 2008, 2010
# $Id: test_device 2928 2002-06-27 08:53:17Z jsrain $
#set -x
+# Make sure to have a clean environment:
export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
EXITCODE=2
trap "EXITCODE=0" 10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/test_remote_ipp new/yast2-printer-2.19.5/tools/test_remote_ipp
--- old/yast2-printer-2.19.4/tools/test_remote_ipp 2009-11-11 12:24:57.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/test_remote_ipp 2010-01-29 14:45:04.000000000 +0100
@@ -13,7 +13,7 @@
# 15 lp not executable (no cups-client RPM installed?)
# The program head is in the coreutils RPM and therefore assumed to exist.
#
-# Johannes Meixner , 2000, 2002, 2007, 2008, 2009
+# Johannes Meixner , 2000, 2002, 2007, 2008, 2009, 2010
# Jan Holesovsky , 2000
# Jiri Srain , 2002
# $Id: test_remote_ipp 43943 2008-01-28 13:38:58Z mzugec $
@@ -25,6 +25,8 @@
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
# Use the binaries of the operating system (no aliases, functions, /usr/local/):
export PING=$( type -ap ping | head -n 1 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/test_remote_lpd new/yast2-printer-2.19.5/tools/test_remote_lpd
--- old/yast2-printer-2.19.4/tools/test_remote_lpd 2009-11-11 12:43:54.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/test_remote_lpd 2010-01-29 14:45:04.000000000 +0100
@@ -18,7 +18,7 @@
# since Suse Linux 11.0 /bin/mktemp is in the coreutils RPM which is required by YaST
# The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist.
#
-# Johannes Meixner , 2000, 2002, 2007, 2008, 2009
+# Johannes Meixner , 2000, 2002, 2007, 2008, 2009, 2010
# Jan Holesovsky , 2000
# Jiri Srain , 2002
# $Id: test_remote_lpd 43943 2008-01-28 13:38:58Z mzugec $
@@ -30,6 +30,8 @@
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
# Use the binaries of the operating system (no aliases, functions, /usr/local/):
export PING=$( type -ap ping | head -n 1 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/test_remote_novell new/yast2-printer-2.19.5/tools/test_remote_novell
--- old/yast2-printer-2.19.4/tools/test_remote_novell 2009-11-11 12:18:03.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/test_remote_novell 2010-01-29 14:45:04.000000000 +0100
@@ -8,7 +8,7 @@
# (10=ping,11=netcat,12=fuser,13=mktemp,14=sed,15=lp,16=smbclient: see test_remote_smb)
# 17 nprint not executable (no ncpfs RPM installed?)
#
-# Johannes Meixner , 2000, 2002, 2007, 2008, 2009
+# Johannes Meixner , 2000, 2002, 2007, 2008, 2009, 2010
# Jan Holesovsky , 2000
# Jiri Srain , 2002
# $Id: test_remote_novell 43943 2008-01-28 13:38:58Z mzugec $
@@ -20,6 +20,8 @@
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
# Use the binaries of the operating system (no aliases, functions, /usr/local/):
export NPRINT=$( type -ap nprint | head -n 1 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/test_remote_smb new/yast2-printer-2.19.5/tools/test_remote_smb
--- old/yast2-printer-2.19.4/tools/test_remote_smb 2009-12-11 16:20:59.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/test_remote_smb 2010-01-29 14:45:04.000000000 +0100
@@ -11,7 +11,7 @@
# 16 smbclient not executable (no samba-client RPM installed?)
# The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist.
#
-# Johannes Meixner , 2000, 2002, 2007, 2008, 2009
+# Johannes Meixner , 2000, 2002, 2007, 2008, 2009, 2010
# Jan Holesovsky , 2000
# Jiri Srain , 2002
# $Id: test_remote_smb 43943 2008-01-28 13:38:58Z mzugec $
@@ -23,6 +23,8 @@
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
# Use the binaries of the operating system (no aliases, functions, /usr/local/):
export PING=$( type -ap ping | head -n 1 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/tools/test_remote_socket new/yast2-printer-2.19.5/tools/test_remote_socket
--- old/yast2-printer-2.19.4/tools/test_remote_socket 2009-11-11 12:40:22.000000000 +0100
+++ new/yast2-printer-2.19.5/tools/test_remote_socket 2010-01-29 14:45:04.000000000 +0100
@@ -11,7 +11,7 @@
# 11 netcat not executable (no netcat RPM installed?)
# The program head is in the coreutils RPM and therefore assumed to exist.
#
-# Johannes Meixner 2002, 2007, 2008, 2009
+# Johannes Meixner 2002, 2007, 2008, 2009, 2010
# Jiri Srain , 2002
# $Id: test_remote_socket 43943 2008-01-28 13:38:58Z mzugec $
@@ -22,6 +22,8 @@
export LC_ALL="POSIX"
export LANG="POSIX"
umask 022
+# Disable bash file name globbing:
+set -f
# Use the binaries of the operating system (no aliases, functions, /usr/local/):
export PING=$( type -ap ping | head -n 1 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.4/VERSION new/yast2-printer-2.19.5/VERSION
--- old/yast2-printer-2.19.4/VERSION 2010-01-22 15:22:03.000000000 +0100
+++ new/yast2-printer-2.19.5/VERSION 2010-03-03 12:15:26.000000000 +0100
@@ -1 +1 @@
-2.19.4
+2.19.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org