[26630] in Source-Commits
/svn/athena r25666 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Jul 27 13:25:04 2012
Date: Fri, 27 Jul 2012 13:25:03 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207271725.q6RHP3qt027850@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-07-27 13:25:03 -0400 (Fri, 27 Jul 2012)
New Revision: 25666
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
Log:
Remove timeout code
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2012-07-27 17:23:35 UTC (rev 25665)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2012-07-27 17:25:03 UTC (rev 25666)
@@ -57,16 +57,6 @@
fi
}
-withtimeout () {
- if dpkg-query --showformat '${Status}\n' -W timeout 2>/dev/null | grep -q ' installed$'; then
- # tct timeout
- timeout 1810 timeout -15 1800 "$@"
- else
- # coreutils timeout
- timeout -k 10s 30m "$@"
- fi
-}
-
SKIP_REBOOT="n"
DEBUG="n"
VERBOSE="n"
