projects
/
abcde.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start the CDDB code with a sane "notfound" default.
[abcde.git]
/
abcde
diff --git
a/abcde
b/abcde
index
281d9d3
..
05f4248
100755
(executable)
--- a/
abcde
+++ b/
abcde
@@
-1364,13
+1364,11
@@
do_discid ()
disktool -u ${CDROM#/dev/}
fi
if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
disktool -u ${CDROM#/dev/}
fi
if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
- if
[ "$TRACKINFO" = "" ]
; then
+ if
$METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM > /dev/null 2>&1
; then
TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM | $CUE2DISCID)
else
TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM | $CUE2DISCID)
else
- if $METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM > /dev/null 2>&1 ; then :; else
- log error "the input flac file does not contain a cuesheet."
- exit 1
- fi
+ log error "the input flac file does not contain a cuesheet."
+ exit 1
fi
else
case "$CDDBMETHOD" in
fi
else
case "$CDDBMETHOD" in
@@
-3330,6
+3328,8
@@
case "$CDDBMETHOD" in
esac
if [ "$DOCDDB" = "y" ]; then
esac
if [ "$DOCDDB" = "y" ]; then
+ # start with a sane default:
+ CDDBLOCALSTATUS=notfound
if [ $CDDBUSELOCAL = "y" ]; then
do_localcddb
fi
if [ $CDDBUSELOCAL = "y" ]; then
do_localcddb
fi