diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-10-09 19:19:07 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-10-09 19:19:07 +0000 |
| commit | e67b3134bece2d5e4bc917d9470525374a4b7dc4 (patch) | |
| tree | 05120c625836013dde7150a7ee044e161f3a9d92 /sys-apps/less | |
| parent | ppc/ppc64 stable wrt #385953 (diff) | |
| download | historical-e67b3134bece2d5e4bc917d9470525374a4b7dc4.tar.gz historical-e67b3134bece2d5e4bc917d9470525374a4b7dc4.tar.bz2 historical-e67b3134bece2d5e4bc917d9470525374a4b7dc4.zip | |
Only run cd-info when the .cue file exists #285507 by Martin von Gagern.
Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/less')
| -rw-r--r-- | sys-apps/less/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/less/Manifest | 12 | ||||
| -rw-r--r-- | sys-apps/less/files/lesspipe.sh | 10 |
3 files changed, 17 insertions, 10 deletions
diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog index 47340a27aebb..fb0efbc2fbd9 100644 --- a/sys-apps/less/ChangeLog +++ b/sys-apps/less/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/less # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.129 2011/06/09 18:37:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.130 2011/10/09 19:19:07 vapier Exp $ + + 09 Oct 2011; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh: + Only run cd-info when the .cue file exists #285507 by Martin von Gagern. *less-444 (09 Jun 2011) diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 1f764622d505..a98c427eacbe 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -4,7 +4,7 @@ Hash: SHA256 AUX README.Gentoo 823 RMD160 be59c37906fca17fa25f6781d3f5e7abc114dc57 SHA1 5a1f126af728f5220b97623050e2f9b1ea5ae58e SHA256 3985fd1810f660ea1c1f2732f719b069b6934d62d8d9e8a09287e63f049ba27d AUX code2color.patch 1110 RMD160 712f7b79c94f92ee62825d5f53627f18fae693d2 SHA1 a82f937f3a923b52adc4f14cfc9b641903884839 SHA256 a3887126826ef0b4b821bd97cf4e7abfc8b1c9280bf2bb18a2a4cec9a2973936 AUX less.envd 47 RMD160 e5f7397769c27ad08aa335a156994799d9d6bc03 SHA1 34f1b5102e63234e0b7a5015bb28823aa29664ca SHA256 961d6e87eeb2b41d163def66718ee78d4b7c778dbe91b24c6764635b0ae1cdd7 -AUX lesspipe.sh 7245 RMD160 c7fb8ed5351864a4e5735118a47b018b7f0c9635 SHA1 05018b6749b182b36d92f8d0cda8846f23cf9dae SHA256 ac4130bd95c0dcbfbffb3b9e3b88b39540af23ca356b8ba75907f41990a6c250 +AUX lesspipe.sh 7364 RMD160 948ce4ee3e80f2c02b1553f38cd912a408bfbc38 SHA1 91633c48fea3210f77eb3f88723fcea61daf61b5 SHA256 f71863303153a9f6377dcdaa8a7836d51d70d70cd71be3d2c6599afad47ea589 DIST code2color 199875 RMD160 378d340a20c3fe500f19116220d54816fe279225 SHA1 b30526dd52c747b8bd6dcf53cf5cc94824c47feb SHA256 ce63f148293a81b0fe5e072f33285f9bf4f1d832f64b23a2220519674a47091d DIST less-436.tar.gz 303921 RMD160 b186b76fcdbf38056b32fbc1b54877dccf64a8ec SHA1 f78998a1a79a7e1962c901dd41bdc3d1c2005471 SHA256 57a16ff07431a9af45cf1cd5b374e1066d019304219f0d156e22bb8c4d6734d2 DIST less-441.tar.gz 306878 RMD160 ff57c76ff4de17dd19663b1dca24051b9181ceed SHA1 241136cc2c7f75c58ad9d1b73f783d5a6aa10d8c SHA256 d8c9add08bfd64654933b6c125690a4d78c458e069bf69b36a4d0c390df2772c @@ -14,12 +14,12 @@ EBUILD less-436.ebuild 1316 RMD160 2cdf643774210eabf75348777eb73f6842be713c SHA1 EBUILD less-441.ebuild 1316 RMD160 c804390be83da93f17f6626ab68f62a708425e30 SHA1 0657447126581148ca697c131f57b78909fe5d68 SHA256 95a0a60404dc84fb52d6e6eb743033360cc1e9b1b360dc67f4a7a2e264a05189 EBUILD less-443.ebuild 1324 RMD160 866ff389fb7be175858d1b769e54bf7519c6d474 SHA1 92f00e02c2f3a659eb26543b094515fcf6114750 SHA256 ca57e7b44c0897c0d97ee4a76a0591983e07d7c912f75480f4216de3c0bc2f9a EBUILD less-444.ebuild 1324 RMD160 6359ddd3b0b3bfc53e6478ae9fe0ee628ded53ea SHA1 56c3cb74ad686bbf0f23bfd9ae325f281d3782f7 SHA256 6f1118a305f7b35cc41e222a9aea46887d74bf8ca33018be610a718634ccda4f -MISC ChangeLog 15311 RMD160 6192ca35af02a6cd2ad8f1a1daf2a75c2a63146a SHA1 d1db67ad05e5bd19dd4e385d8c90a4597961b1f0 SHA256 6ac19f1ec9f6029d06ffde8368083912cb440d4a72aef174ce88d0aa6b252c7a +MISC ChangeLog 15456 RMD160 79f8afd6f4f3b0cdce9b04552199079f1f2b5d23 SHA1 d15fbd21aef692094334fb72bb074247c49eee1e SHA256 97bbfff3ea62844d9e85161ae5cf1b01fd1ec5ae8a3b278a9e5607c07f0467b6 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk3xEvEACgkQaC/OocHi7JYaywEAm5WphNKcmMp5LbiD7F3+Rxx+ -3bbnjC4PPUAURmgrUzQA/07cEvH/IMTGvHuy8VFVI2XnMvt3f97g/bVjwSOEPOOI -=L1Tp +iF4EAREIAAYFAk6R87EACgkQaC/OocHi7Ja//wD6A98JSgYJaQNZkpAOziXa7O2y +h7Es8fxI0j2lGzwR4wwA/1KljG3lhBq09FjZiZhUZVVOXLMYW8j0Hp+tAA/8ye9t +=iFRG -----END PGP SIGNATURE----- diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh index b656e3067f2e..4fc04acec660 100644 --- a/sys-apps/less/files/lesspipe.sh +++ b/sys-apps/less/files/lesspipe.sh @@ -160,8 +160,12 @@ lesspipe() { *.flac) metaflac --list "$1" ;; *.torrent) torrentinfo "$1" || torrentinfo-console "$1" || ctorrent -x "$1" ;; *.bin|*.cue|*.raw) - # not all .bin/.raw files are cd images, so fall back to hexdump - cd-info --no-header --no-device-info "$1" || lesspipe_file "$1" + # not all .bin/.raw files are cd images #285507 + # fall back to lesspipe_file if .cue doesn't exist, or if + # cd-info failed to parse things sanely + [[ -e ${1%.*}.cue ]] \ + && cd-info --no-header --no-device-info "$1" \ + || lesspipe_file "$1" ;; *.iso) iso_info=$(isoinfo -d -i "$1") @@ -229,7 +233,7 @@ if [[ -z $1 ]] ; then elif [[ $1 == "-V" || $1 == "--version" ]] ; then Id="cvsid" cat <<-EOF - $Id: lesspipe.sh,v 1.45 2011/01/20 03:26:14 vapier Exp $ + $Id: lesspipe.sh,v 1.46 2011/10/09 19:19:07 vapier Exp $ Copyright 2001-2010 Gentoo Foundation Mike Frysinger <vapier@gentoo.org> (with plenty of ideas stolen from other projects/distros) |