Imported Debian patch 1.2.16rel-4

diff --git a/debian/bash_completion b/debian/bash_completion
new file mode 100644 (file)
index 0000000..2b29ac8
--- /dev/null
+++ b/debian/bash_completion
@@ -0,0 +1,45 @@
+# mtx completion by Jon Middleton <jjm@ixtab.org.uk>
+#
+# $Id: bash_completion,v 1.1 2004/02/15 05:43:25 bdale Exp $
+
+_mtx()
+{
+    local cur prev options tapes drives
+    
+    COMPREPLY=()
+    cur=${COMP_WORDS[COMP_CWORD]}
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    options="-f nobarcode invert noattach --version inquiry noattach \
+             inventory status load unload eepos first last next"
+
+    tapes=$(mtx status | \
+       awk '/Storage Element [0-9]+:Full/ { printf "%s ", $3 }')
+    tapes=${tapes//:Full}
+
+    drives=$(mtx status | \
+            awk '/Data Transfer Element [0-9]+:(Full|Empty)/ { printf "%s ", $4 }')
+    drives=${drives//:Full}
+    drives=${drives//:Empty}
+
+    if [ $COMP_CWORD -gt 1 ]; then
+       case $prev in 
+           load) 
+               COMPREPLY=( $( compgen -W "$tapes" -- $cur ) )          
+               ;;
+           unload|first|last|next)
+               COMPREPLY=( $( compgen -W "$drives" -- $cur ) )
+               ;;
+           -f)
+               true
+               ;;
+           *)
+               true
+               ;;
+       esac
+    else
+        COMPREPLY=( $( compgen -W "$options" -- $cur ) )
+    fi
+    return 0
+} 
+complete -F _mtx mtx

diff --git a/debian/changelog b/debian/changelog
index 22afc9fff4118d9d728ac5553663460a3763a635..a9222e454b8ec4c76bb8c9e4c0b5d01b393c11ab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mtx (1.2.16rel-4) unstable; urgency=medium
+
+  * revert SG_SCSI_DEFAULT_TIMEOUT to 5 minutes since at least the Sony
+    TLS-9000 takes more than a minute to load sometimes, closes: #229169
+  * remove 'previous' from command summary, since it's not actually 
+    implemented in the program, closes: #230041
+  * include bash_completion file from Jon Middleton, closes: #227456
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 14 Feb 2004 22:36:23 -0700
+
 mtx (1.2.16rel-3) unstable; urgency=low
 
   * apply patch from Torsten Werner <twerner@debian.org> that elminates

diff --git a/debian/dirs b/debian/dirs
index 236670a2d0f482de71df55c13f785fadb3cd13df..ce5d4fb707ac6504100d60b5587397b97f402456 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1,2 @@
+etc/bash_completion.d
 usr/sbin

diff --git a/debian/rules b/debian/rules
index a6b3ef8c4ca9505885073c6e98666b88a56fc146..6e2a299ede9700a089ca6f9a057fd12483a5ecd6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,8 @@ install: build
 
        make install bindir=`pwd`/debian/mtx/bin prefix=`pwd`/debian/mtx/usr \
                mandir=`pwd`/debian/mtx/usr/share/man
+       install -o root -g root -m 0644 debian/bash_completion \
+               debian/mtx/etc/bash_completion.d/mtx
 
 # Build architecture-independent files here.
 binary-indep: build install

diff --git a/mtx.c b/mtx.c
index 7390566b3d469312b01c98d7068b9826aca89e1c..7eed0bad59b7c9c8d8f0b9929b1f9abc40bdb44d 100644 (file)
--- a/mtx.c
+++ b/mtx.c
@@ -157,7 +157,6 @@ static void Usage()
   mtx [ -f <loader-dev> ] first [<drive#>]\n\
   mtx [ -f <loader-dev> ] last [<drive#>]\n\
   mtx [ -f <loader-dev> ] next [<drive#>]\n\
-  mtx [ -f <loader-dev> ] previous [<drive#>]\n\
   mtx [ -f <loader-dev> ] [invert] load <storage-element-number> [<drive#>]\n\
   mtx [ -f <loader-dev> ] [invert] unload [<storage-element-number>][<drive#>]\n\
   mtx [ -f <loader-dev> ] [eepos eepos-number] transfer <storage-element-number> <storage-element-number>\n\

diff --git a/scsi_linux.c b/scsi_linux.c
index e6371840e2482fa5d974276542bbc0b5a842732d..c5a350852b662448cb2ed2ad6b8e033f4e42ec62 100644 (file)
--- a/scsi_linux.c
+++ b/scsi_linux.c
@@ -56,11 +56,11 @@ $Revision: 1.2 $
 #define STILL_A_VALID_READ(s) (HIT_FILEMARK(s) || SHORT_READ(s) || HIT_EOD(s) || HIT_EOP(s) || HIT_EOM(s))
 
 
-#define SG_SCSI_DEFAULT_TIMEOUT SG_DEFAULT_TIMEOUT
+#define SG_SCSI_DEFAULT_TIMEOUT HZ*60*5                        /* 5 minutes */
 
 DEVICE_TYPE SCSI_OpenDevice(char *DeviceName)
 {
-  int timeout=SG_SCSI_DEFAULT_TIMEOUT;      /* 5 minutes */
+  int timeout=SG_SCSI_DEFAULT_TIMEOUT;
   int DeviceFD = open(DeviceName, O_RDWR);
   if (DeviceFD < 0)
     FatalError("cannot open SCSI device '%s' - %m\n", DeviceName);