[23365] in Source-Commits
/svn/athena r23019 - in trunk/debathena/debathena/evolution-wrapper: . debian
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Wed Jun 11 13:55:22 2008
Date: Wed, 11 Jun 2008 13:55:02 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200806111755.NAA28089@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-06-11 13:55:01 -0400 (Wed, 11 Jun 2008)
New Revision: 23019
Modified:
trunk/debathena/debathena/evolution-wrapper/debian/changelog
trunk/debathena/debathena/evolution-wrapper/evolution.debathena
Log:
In evolution-wrapper:
* Fix updating of server name from Hesiod.
* Convert @_hesiod server specifications if we see them.
Modified: trunk/debathena/debathena/evolution-wrapper/debian/changelog
===================================================================
--- trunk/debathena/debathena/evolution-wrapper/debian/changelog 2008-06-09 18:04:25 UTC (rev 23018)
+++ trunk/debathena/debathena/evolution-wrapper/debian/changelog 2008-06-11 17:55:01 UTC (rev 23019)
@@ -1,3 +1,10 @@
+debathena-evolution-wrapper (10.0.2) unstable; urgency=low
+
+ * Fix updating of server name from Hesiod.
+ * Convert @_hesiod server specifications if we see them.
+
+ -- Greg Hudson <ghudson@mit.edu> Wed, 11 Jun 2008 13:54:26 -0400
+
debathena-evolution-wrapper (10.0.1) unstable; urgency=low
* Depend on debathena-evolution-data-server to ensure krb4 support.
Modified: trunk/debathena/debathena/evolution-wrapper/evolution.debathena
===================================================================
--- trunk/debathena/debathena/evolution-wrapper/evolution.debathena 2008-06-09 18:04:25 UTC (rev 23018)
+++ trunk/debathena/debathena/evolution-wrapper/evolution.debathena 2008-06-11 17:55:01 UTC (rev 23019)
@@ -28,12 +28,15 @@
my $accounts = $client->get_list("/apps/evolution/mail/accounts");
if ($accounts) {
- # Update the server with the value from Hesiod.
+ # Update the server with the value from Hesiod. Also convert
+ # Athena 9.4-style Hesiod specifications (although it should be
+ # unusual to see one due to debathena-gconf2-config).
my $change = 0;
foreach (@$accounts) {
my $old = $_;
if (/name="MIT mail"/) {
- s|(imap://[^/]*@)(po\d+\.mit\.edu)|\1$server|;
+ s|(imap://[^/]*\@)(po\d+\.mit\.edu)|\1$server|i;
+ s|(imap://[^/]*\@)_hesiod|\1$server|;
}
$change = 1 if ($_ ne $old);
}
