[26050] in Source-Commits
/svn/athena r25364 - in trunk/debathena/debathena/dotfiles: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Aug 9 09:10:49 2011
Date: Tue, 9 Aug 2011 09:10:41 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108091310.p79DAfIc002482@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-09 09:10:40 -0400 (Tue, 09 Aug 2011)
New Revision: 25364
Modified:
trunk/debathena/debathena/dotfiles/bashrc
trunk/debathena/debathena/dotfiles/cshrc
trunk/debathena/debathena/dotfiles/debian/changelog
Log:
In dotfiles:
* Actually fix Trac #512 by checking for the correct values in $command
and $BASH_EXECUTION_STRING (Hint: the original code didn't work when
it the sftp-server was nice'd). It's unclear that the scp-related
block of the case statements ever get called, but scp also doesn't
suck with verbose dotfiles, so "meh"
Modified: trunk/debathena/debathena/dotfiles/bashrc
===================================================================
--- trunk/debathena/debathena/dotfiles/bashrc 2011-08-09 08:21:26 UTC (rev 25363)
+++ trunk/debathena/debathena/dotfiles/bashrc 2011-08-09 13:10:40 UTC (rev 25364)
@@ -9,7 +9,7 @@
# Determine if we're in an sftp or scp session and if so, be quiet
SILENT=no
case "$BASH_EXECUTION_STRING" in
- /usr/lib/openssh/sftp-server)
+ */usr/lib/openssh/sftp-server)
SILENT=yes
;;
scp\ *)
Modified: trunk/debathena/debathena/dotfiles/cshrc
===================================================================
--- trunk/debathena/debathena/dotfiles/cshrc 2011-08-09 08:21:26 UTC (rev 25363)
+++ trunk/debathena/debathena/dotfiles/cshrc 2011-08-09 13:10:40 UTC (rev 25364)
@@ -11,7 +11,7 @@
set SILENT=no
if ($?command) then
switch ("$command")
- case /usr/lib/openssh/sftp-server:
+ case '*/usr/lib/openssh/sftp-server':
set SILENT=yes
breaksw
case 'scp *':
Modified: trunk/debathena/debathena/dotfiles/debian/changelog
===================================================================
--- trunk/debathena/debathena/dotfiles/debian/changelog 2011-08-09 08:21:26 UTC (rev 25363)
+++ trunk/debathena/debathena/dotfiles/debian/changelog 2011-08-09 13:10:40 UTC (rev 25364)
@@ -1,4 +1,4 @@
-debathena-dotfiles (10.0.28-0debathena2) UNRELEASED; urgency=low
+debathena-dotfiles (10.0.28-0debathena2) unstable; urgency=low
[ Geoffrey Thomas ]
* quotawarn hasn't been in this package since 10.0.2-0debathena3, so
@@ -6,8 +6,13 @@
[ Jonathan Reed ]
* Remove unneeded check for bash, per the comment (Trac: #878)
+ * Actually fix Trac #512 by checking for the correct values in $command
+ and $BASH_EXECUTION_STRING (Hint: the original code didn't work when
+ it the sftp-server was nice'd). It's unclear that the scp-related
+ block of the case statements ever get called, but scp also doesn't
+ suck with verbose dotfiles, so "meh"
- -- Jonathan Reed <jdreed@mit.edu> Mon, 01 Aug 2011 16:20:13 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 09 Aug 2011 09:10:24 -0400
debathena-dotfiles (10.0.28-0debathena1) unstable; urgency=low
