[26626] in Source-Commits
/svn/athena r25663 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Jul 27 10:40:37 2012
Date: Fri, 27 Jul 2012 10:40:33 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207271440.q6REeXLS010786@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 10:40:33 -0400 (Fri, 27 Jul 2012)
New Revision: 25663
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-upgrade
trunk/debathena/config/auto-update/debian/changelog
trunk/debathena/config/auto-update/debian/debathena-auto-update.logrotate
Log:
In auto-update:
* Be more verbose in auto-upgrade
* rotate auto-upgrade logs
Modified: trunk/debathena/config/auto-update/debian/athena-auto-upgrade
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2012-07-26 18:20:00 UTC (rev 25662)
+++ trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2012-07-27 14:40:33 UTC (rev 25663)
@@ -76,9 +76,8 @@
function complain() {
- if [ $DEBUG -eq 1 ]; then
- echo "ERROR: $*"
- else
+ echo "ERROR: $*"
+ if [ $DEBUG -ne 1 ]; then
logger -t "athena-auto-upgrade" -p user.notice "$*"
fi
}
@@ -110,6 +109,7 @@
if [ $FORCE -eq 1 ]; then
echo "Would normally quit here, but you passed -f, so we keep going..."
else
+ echo "Ending upgrade at $(date)"
exit 0
fi
}
@@ -120,6 +120,7 @@
exec >>/var/log/athena-upgrade 2>&1
fi
+echo
echo "Starting upgrade at $(date)"
# Not supported on Debian
@@ -172,7 +173,7 @@
if [[ ! -z "$DEBUG_RELEASE" ]]; then
UBUNTU_RELEASE=$DEBUG_RELEASE
else
- debug "No new releases."
+ echo "No new releases found."
exit 0
fi
fi
@@ -180,7 +181,7 @@
complain "Tried to upgrade to already running release; shouldn't happen"
exit 1
fi
-debug "OK, trying to upgrade to $UBUNTU_RELEASE"
+echo "Found $UBUNTU_RELEASE, starting upgrade"
# That's a space and then a tab inside the brackets
if egrep -q '^flags[ ].* lm( |$)' /proc/cpuinfo; then
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2012-07-26 18:20:00 UTC (rev 25662)
+++ trunk/debathena/config/auto-update/debian/changelog 2012-07-27 14:40:33 UTC (rev 25663)
@@ -1,9 +1,11 @@
-debathena-auto-update (1.37) UNRELEASED; urgency=low
+debathena-auto-update (1.37) unstable; urgency=low
* Bump debian/compat to 6
* Inhibit all dpkg pre- and post- hooks during the download phase (Trac: #1020)
+ * Be more verbose in auto-upgrade
+ * rotate auto-upgrade logs
- -- Jonathan Reed <jdreed@mit.edu> Fri, 06 Jul 2012 12:55:34 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 27 Jul 2012 10:40:22 -0400
debathena-auto-update (1.36) unstable; urgency=low
Modified: trunk/debathena/config/auto-update/debian/debathena-auto-update.logrotate
===================================================================
--- trunk/debathena/config/auto-update/debian/debathena-auto-update.logrotate 2012-07-26 18:20:00 UTC (rev 25662)
+++ trunk/debathena/config/auto-update/debian/debathena-auto-update.logrotate 2012-07-27 14:40:33 UTC (rev 25663)
@@ -5,3 +5,11 @@
missingok
notifempty
}
+
+/var/log/athena-upgrade {
+ rotate 6
+ monthly
+ compress
+ missingok
+ notifempty
+}
