Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2012-10-24 07:20:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2012-10-12 08:16:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2012-10-24 10:24:38.000000000 +0200 @@ -2 +2,13 @@ -Mon Sep 24 06:17:16 UTC 2012 - [email protected] +Fri Oct 19 11:36:26 CEST 2012 - [email protected] + +- added Syslog module, simple API to write into system log +- 2.23.7 + +------------------------------------------------------------------- +Thu Oct 11 14:49:04 CEST 2012 - [email protected] + +- removed calls to /sbin/SuSEconfig, packages should care of + updating configurations on their own + +------------------------------------------------------------------- +Mon Oct 01 06:17:16 UTC 2012 - [email protected] @@ -5,0 +18,6 @@ + +------------------------------------------------------------------- +Mon Sep 24 17:38:52 CEST 2012 - [email protected] + +- Fixed detection whether firewall is running (BNC #779455) and + unified with starting and stopping the service via Service API. Old: ---- yast2-2.23.6.tar.bz2 New: ---- yast2-2.23.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.Pi3WDO/_old 2012-10-24 10:24:40.000000000 +0200 +++ /var/tmp/diff_new_pack.Pi3WDO/_new 2012-10-24 10:24:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 2.23.6 +Version: 2.23.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-2.23.6.tar.bz2 -> yast2-2.23.7.tar.bz2 ++++++ ++++ 17517 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-2.23.6/VERSION new/yast2-2.23.7/VERSION --- old/yast2-2.23.6/VERSION 2012-09-24 09:29:29.000000000 +0200 +++ new/yast2-2.23.7/VERSION 2012-10-19 11:36:38.000000000 +0200 @@ -1 +1 @@ -2.23.6 +2.23.7 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-2.23.6/configure.in new/yast2-2.23.7/configure.in --- old/yast2-2.23.6/configure.in 2012-08-03 12:57:10.000000000 +0200 +++ new/yast2-2.23.7/configure.in 2012-10-18 14:54:00.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.23.1, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.23.6, http://bugs.opensuse.org/, yast2) 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.23.1" +VERSION="2.23.6" RPMNAME="yast2" MAINTAINER="Jiri Srain <[email protected]>" 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-2.23.6/library/modules/Syslog.ycp new/yast2-2.23.7/library/modules/Syslog.ycp --- old/yast2-2.23.6/library/modules/Syslog.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.23.7/library/modules/Syslog.ycp 2012-10-18 16:22:24.000000000 +0200 @@ -0,0 +1,44 @@ +/** + * File: modules/Syslog.ycp + * Package: yast2 + * Summary: Access to system log + * + * Usage: + * Syslog::ComplexLog ("", ["-i", "-f", "/tmp/logmessage"]); + * Syslog::Log ("user was created"); + */ + +{ + +module "Syslog"; + +import "String"; + +/** + * Write a message into system log + * @param log message + * @param logger options - see man logger for a list + * @return result off logger call + */ +global boolean ComplexLog (string message, list<string> options) { + + options = maplist (string o, options, { + return sformat ("'%1'", String::Quote (o)); + }); + + return 0 == SCR::Execute (.target.bash, sformat ("/bin/logger %1 -- %2", + mergestring (options, " "), + message == "" ? "" : ("'" + String::Quote (message) + "'")) + ); +} + +/** + * Write a message into system log + * @param log message + * @return result off logger call + */ +global boolean Log (string message) { + + return ComplexLog (message, []); +} +} 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-2.23.6/library/modules/Version.ycp new/yast2-2.23.7/library/modules/Version.ycp --- old/yast2-2.23.6/library/modules/Version.ycp 2012-10-01 10:27:29.000000000 +0200 +++ new/yast2-2.23.7/library/modules/Version.ycp 2012-10-19 11:38:49.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.23.6"; +global string yast2 = "2.23.7"; /* EOF */ } 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-2.23.6/library/network/src/SuSEFirewall.ycp new/yast2-2.23.7/library/network/src/SuSEFirewall.ycp --- old/yast2-2.23.6/library/network/src/SuSEFirewall.ycp 2012-09-24 08:46:56.000000000 +0200 +++ new/yast2-2.23.7/library/network/src/SuSEFirewall.ycp 2012-10-18 10:31:39.000000000 +0200 @@ -111,13 +111,13 @@ /* list of services currently allowed, which share ports (for instance RPC services) */ map <string, list <string> > allowed_conflict_services = $[]; + /* service for starting and checking firewall status */ + string firewall_service = "SuSEfirewall2_setup"; + /* services needed for well-running firewall */ list <string> firewall_services = [ "SuSEfirewall2_init", "SuSEfirewall2_setup" ]; list <string> firewall_services_reverse = [ "SuSEfirewall2_setup", "SuSEfirewall2_init" ]; - /* script for starting and checking firewall status */ - string firewall_script = "/sbin/SuSEfirewall2"; - list <string> SuSEFirewall_variables = [ // zones and interfaces "FW_DEV_INT", "FW_DEV_DMZ", "FW_DEV_EXT", @@ -1224,32 +1224,18 @@ * @return boolean result */ global define boolean StartServices () { - boolean all_ok = true; - if (! SuSEFirewallIsInstalled()) return false; - // bug #215416 - // SuSEfirewall2_init doesn't need to be called, only enabled - if (Mode::testsuite()) return true; - string tmpdir_file = (string) SCR::Read(.target.tmpdir); - if (tmpdir_file == nil || tmpdir_file == "") tmpdir_file = "/var/lib/YaST2"; - tmpdir_file = tmpdir_file + "/SuSEfirewall2_YaST_output"; - - string command = sformat( - "%1 start 2>'%2'; cat '%2'; rm -rf '%2'", - firewall_script, tmpdir_file - ); - y2milestone ("Starting firewall..."); - map cmd = (map) SCR::Execute (.target.bash_output, command); - if (cmd["exit"]:nil != 0) { - y2error ("Starting firewall: >%1< returned %2", command, cmd); - all_ok = false; - } else { + + // SuSEfirewall2_init doesn't need to be called, only enabled + if (Service::Start(firewall_service)) { y2milestone ("Started"); + return true; + } else { + y2error ("Cannot start service %1", firewall_service); + return false; } - - return all_ok; } /** @@ -1258,32 +1244,18 @@ * @return boolean result */ global define boolean StopServices () { - boolean all_ok = true; - if (! SuSEFirewallIsInstalled()) return false; - // bug #215416 - // SuSEfirewall2_init doesn't need to be called, only disabled - if (Mode::testsuite()) return true; - string tmpdir_file = (string) SCR::Read(.target.tmpdir); - if (tmpdir_file == nil || tmpdir_file == "") tmpdir_file = "/var/lib/YaST2"; - tmpdir_file = tmpdir_file + "/SuSEfirewall2_YaST_output"; - - string command = sformat( - "%1 stop 2>'%2'; cat '%2'; rm -rf '%2'", - firewall_script, tmpdir_file - ); - y2milestone ("Stopping firewall..."); - map cmd = (map) SCR::Execute (.target.bash_output, command); - if (cmd["exit"]:nil != 0) { - y2error ("Stopping firewall: >%1< returned %2", command, cmd); - all_ok = false; - } else { + + // SuSEfirewall2_init doesn't need to be called, only disabled + if (Service::Stop(firewall_service)) { y2milestone ("Stopped"); + return true; + } else { + y2error ("Could not stop service %1", firewall_service); + return false; } - - return all_ok; } /** @@ -1377,9 +1349,7 @@ if (Mode::testsuite()) return true; y2milestone ("Checking firewall status..."); - string cmd = sformat ("%1 status 1>/dev/null", firewall_script); - integer cmd_ret = (integer) SCR::Execute (.target.bash, cmd); - if (cmd_ret == 0) { + if (Service::Status(firewall_service) == 0) { y2milestone ("Firewall services are started"); started = true; } else { 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-2.23.6/library/packages/doc/index.html new/yast2-2.23.7/library/packages/doc/index.html --- old/yast2-2.23.6/library/packages/doc/index.html 2012-07-02 14:00:27.000000000 +0200 +++ new/yast2-2.23.7/library/packages/doc/index.html 2012-10-18 10:31:39.000000000 +0200 @@ -86,7 +86,6 @@ <h3>Other</h3> <ul> -<li>void RunSUSEconfig(); <li>boolean LastOperationCanceled(); <li>boolean InstallKernel (list<<string>> kernel_modules); </ul> 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-2.23.6/library/packages/src/PackageSystem.ycp new/yast2-2.23.7/library/packages/src/PackageSystem.ycp --- old/yast2-2.23.6/library/packages/src/PackageSystem.ycp 2012-07-02 14:00:27.000000000 +0200 +++ new/yast2-2.23.7/library/packages/src/PackageSystem.ycp 2012-10-18 10:31:39.000000000 +0200 @@ -329,17 +329,6 @@ }); if(ok != true) return false; - // Only run SUSEconfig if any packages were installed? - // No, deleted packages are not covered by this. - // if (true || result[0]:-1 > 0) - - // But omit it during installation, one is run at its end. - // #25071 - if (!Stage::initial () && !Stage::cont ()) - { - RunSUSEconfig (); - } - // a package or a patch was installed, may be that there is a new yast agent if (any_to_install) { 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-2.23.6/library/packages/src/common.ycp new/yast2-2.23.7/library/packages/src/common.ycp --- old/yast2-2.23.6/library/packages/src/common.ycp 2012-07-02 14:00:27.000000000 +0200 +++ new/yast2-2.23.7/library/packages/src/common.ycp 2012-10-18 10:31:39.000000000 +0200 @@ -225,44 +225,6 @@ return RemoveAllMsg(packages, nil); } -/** - * Run SUSEconfig, create new wizard dialog before it, - * close after it is finished - */ -global void RunSUSEconfig() { - if (Mode::commandline()) - { - // in the commandline mode start SuSEconfig in background - SCR::Execute(.background.run_output, "/sbin/SuSEconfig"); - - list<string> script_out = []; - symbol ret = nil; - - // print SuSEconfig output - while((boolean)SCR::Read(.background.output_open) || ((integer)SCR::Read(.background.newlines) > 0)) - { - script_out = (list<string>)SCR::Read(.background.newout); - - foreach(string line, script_out, { - CommandLine::PrintVerbose(line); - } - ); - - while ((integer)SCR::Read(.background.newlines) == 0 && (boolean)SCR::Read(.background.output_open)) - { - sleep(200); // small wait - } - } - } - else - { - Wizard::CreateDialog (); - // inst_suseconfig returns `auto or `next - // (update mode or Args(2) is true) => no error checking - WFM::CallFunction("inst_suseconfig", [$["enable_back":false, "enable_next":false]]); - Wizard::CloseDialog (); - } -} /** * Return result of the last operation 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-2.23.6/missing new/yast2-2.23.7/missing --- old/yast2-2.23.6/missing 2012-08-03 12:57:13.000000000 +0200 +++ new/yast2-2.23.7/missing 2012-10-18 14:54:04.000000000 +0200 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
