Imported Upstream version 3.1.0

[debian/amanda] / changer-src / chg-chs.sh

diff --git a/changer-src/chg-chs.sh b/changer-src/chg-chs.sh
index 8679711de05d9f8f05eea7ac1a8c5c4af5832086..4ec6f68d4ab5c41821d988e5910832d45553f968 100644 (file)
--- a/changer-src/chg-chs.sh
+++ b/changer-src/chg-chs.sh
@@ -50,15 +50,8 @@ fi
 
 CHS=@CHS@
 
-USE_VERSION_SUFFIXES="@USE_VERSION_SUFFIXES@"
-if test "$USE_VERSION_SUFFIXES" = "yes"; then
-       SUF="-@VERSION@"
-else
-       SUF=
-fi
-
-ourconf=`amgetconf$SUF changerfile`
-changerdev=`amgetconf$SUF changerdev`
+ourconf=`amgetconf changerfile`
+changerdev=`amgetconf changerdev`
 if test -n "$changerdev" && test x"$changerdev" != x/dev/null; then
        CHS="$CHS -f$changerdev"
 fi
@@ -377,7 +370,7 @@ echo curloaded $curloaded                   >> $ourstate
 # return slot info
 
 if [ $slotempty -eq 1 ]; then
-       answer=`_ '<none> %s: %s slot is empty' "$pname" "$newslot"`
+       answer=`_ '<none> %s: %s slot is empty: %s' "$pname" "$newslot" "$amdevcheck_message"`
        echo `_ 'Exit ->'` $answer >> $logfile
        echo $answer
        exit 1