add back in a simpler match for conf/txt/log as suggested by Benno Schulenberg #150256

Package-Manager: portage-2.1.2_rc1-r2

diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index ed55837ce4ea476f802124db05e9cadcce0858f2..cf87d7f869bc46e28c98063941fefcb71b14fd17 100644 (file)
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -9,10 +9,10 @@ AUX code2color.patch 1110 RMD160 712f7b79c94f92ee62825d5f53627f18fae693d2 SHA1 a
 MD5 40be3763d55fd69bb37d85c22f4192a4 files/code2color.patch 1110
 RMD160 712f7b79c94f92ee62825d5f53627f18fae693d2 files/code2color.patch 1110
 SHA256 a3887126826ef0b4b821bd97cf4e7abfc8b1c9280bf2bb18a2a4cec9a2973936 files/code2color.patch 1110
-AUX lesspipe.sh 5441 RMD160 d7404e053ed826d5081288f4ebda1d23e7ddd6c2 SHA1 d12b345a6552fc190b67c8a2da1411609673bbb9 SHA256 78bf1dace53076d198e9c3a480465214d46b83f1299d77091a5ffb3c4709906b
-MD5 08a3d6908d7f8481749ef864dbed3e1a files/lesspipe.sh 5441
-RMD160 d7404e053ed826d5081288f4ebda1d23e7ddd6c2 files/lesspipe.sh 5441
-SHA256 78bf1dace53076d198e9c3a480465214d46b83f1299d77091a5ffb3c4709906b files/lesspipe.sh 5441
+AUX lesspipe.sh 5512 RMD160 56870bd22ad3d1a7315d08cabd0740babb5bb7e1 SHA1 132e710de2ddd34f617580d8116de9fb5acf6272 SHA256 9bf4cf8cc2ee3b5d7c78aa662d844839e86cc0ca1ccaf501627f1c01a3c1529c
+MD5 b5f12736188db8ce5b2890eb34577f19 files/lesspipe.sh 5512
+RMD160 56870bd22ad3d1a7315d08cabd0740babb5bb7e1 files/lesspipe.sh 5512
+SHA256 9bf4cf8cc2ee3b5d7c78aa662d844839e86cc0ca1ccaf501627f1c01a3c1529c files/lesspipe.sh 5512
 DIST code2color 199875 RMD160 378d340a20c3fe500f19116220d54816fe279225 SHA1 b30526dd52c747b8bd6dcf53cf5cc94824c47feb SHA256 ce63f148293a81b0fe5e072f33285f9bf4f1d832f64b23a2220519674a47091d
 DIST less-394.tar.gz 292585 RMD160 a0ab2583a38a1c6dcfe6ee23f535f7f341742116 SHA1 fa0d9aa30ec461866786c4080bb594fc3337bb02 SHA256 24fc383723c73857ac01179364bacdd64c5b8dfe83afce9a665de8cc52ffa90b
 EBUILD less-394.ebuild 1296 RMD160 b32775d07630d4e0747ad6db3b0ebae6c6813109 SHA1 6e64852e0d4e84b272aaf5597f51ccd7f6189d37 SHA256 912ea242b85b16510b28860217b04a12c876ef6190e15a430f06b6e928126b13
@@ -33,7 +33,7 @@ SHA256 1a925cad31887d274131dce69c406db3476d0edc1c51b155a0df10d8c147e620 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFTarwamhnQswr0vIRAmRhAJ0R/XMjuSg637DEL1efsO8T4eDwXACfQf0w
-eHs59REPiyzYJybmkojogtY=
-=HyhJ
+iD8DBQFFTl68amhnQswr0vIRAjdRAJ47tSFTEIzTjnUR8UosQPKjDtPOnwCgsTve
+p+XFWVrmgJivPqXHkp653us=
+=15Fr
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
index d670466957cad81be11ea6fe81bd132e256164dd..d1dae0dc2ea97f33e9c53370b9f9ae49d567a34f 100644 (file)
--- a/sys-apps/less/files/lesspipe.sh
+++ b/sys-apps/less/files/lesspipe.sh
@@ -71,6 +71,7 @@ lesspipe() {
        *.ps|*.pdf) ps2ascii "$1" || pstotext "$1" || pdftotext "$1" ;;
        *.doc)      antiword "$1" || catdoc "$1" ;;
        *.rtf)      unrtf --nopict --text "$1" ;;
+       *.conf|*.txt|*.log) ;; # force less to work on these directly #150256
 
        ### URLs ###
        ftp://*|http://*|*.htm|*.html)
@@ -186,7 +187,7 @@ if [[ -z $1 ]] ; then
        echo "Usage: lesspipe.sh <file>"
 elif [[ $1 == "-V" ]] ; then
        Id="cvsid"
-       cvsid="$Id: lesspipe.sh,v 1.18 2006/11/05 09:11:45 vapier Exp $"
+       cvsid="$Id: lesspipe.sh,v 1.19 2006/11/05 21:58:50 vapier Exp $"
        cat <<-EOF
                $cvsid
                Copyright 2001-2005 Gentoo Foundation