Accepting request 762787 from Printing

- Handle relative paths more gracefully 

- Allow %stdout as well as %stdout% for -sOutputFile=

OBS-URL: https://build.opensuse.org/request/show/762787
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gswrap?expand=0&rev=2

gswrap

@@ -11,7 +11,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 2.1 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -73,7 +73,7 @@ do
 	;;
     -sOutputFile=*)
 	case "${arg#-sOutputFile=}" in
-	%stdout%|%stderr%|-|"")
+	%stdout%|%stderr%|%stdout|%stderr|-|"")
 	    continue ;;
 	%pipe%*)
 	    pipecmd=${arg#-sOutputFile=%pipe%}
@@ -104,8 +104,6 @@ do
 		trap "finish '$PWD' '$tmp'" ERR EXIT SIGINT SIGHUP
 		opts[o++]="--bind ${tmp+"$tmp"} $home/out"
 	    fi
-	    # change to new working directory in sandbox
-	    opts[o++]="--chdir $home/out"
 	fi
 	argv[argc]="-sOutputFile=$home/out/${file}"
 	continue
@@ -129,6 +127,8 @@ do
     then
 	opts[o++]="--ro-bind $arg $home/$arg"
     else
+	arg="$(realpath $arg)" || exit 1
+	argv[argc]="$arg"
 	test "$arg" != / || continue
 	test "$arg" != /home || continue
 	test "$arg" != $home || continue

gswrap.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jan 10 10:51:59 UTC 2020 - Dr. Werner Fink <werner@suse.de>
+
+- Handle relative paths more gracefully 
+
+-------------------------------------------------------------------
+Fri Jan 10 08:53:48 UTC 2020 - Dr. Werner Fink <werner@suse.de>
+
+- Allow %stdout as well as %stdout% for -sOutputFile= 
+
 -------------------------------------------------------------------
 Wed Aug 28 11:17:46 UTC 2019 - Dr. Werner Fink <werner@suse.de>
 

gswrap.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gswrap
 #
-# Copyright (c) 2019 SUSE Linux GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed