[27228] in Source-Commits
/svn/athena r26032 - in trunk/third/moira: clients/moira debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Jun 6 11:51:57 2013
Date: Thu, 6 Jun 2013 11:51:50 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201306061551.r56Fpo6g029105@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-06-06 11:51:49 -0400 (Thu, 06 Jun 2013)
New Revision: 26032
Modified:
trunk/third/moira/clients/moira/user.c
trunk/third/moira/debian/changelog
Log:
In moira:
* Re-import moira at r4114 to pick up bugfix
Modified: trunk/third/moira/clients/moira/user.c
===================================================================
--- trunk/third/moira/clients/moira/user.c 2013-06-02 22:22:21 UTC (rev 26031)
+++ trunk/third/moira/clients/moira/user.c 2013-06-06 15:51:49 UTC (rev 26032)
@@ -1,4 +1,4 @@
-/* $Id: user.c 4113 2013-05-28 14:29:10Z zacheiss $
+/* $Id: user.c 4114 2013-06-05 18:57:06Z zacheiss $
*
* This is the file user.c for the Moira Client, which allows users
* to quickly and easily maintain most parts of the Moira database.
@@ -25,7 +25,7 @@
#include <string.h>
#include <time.h>
-RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/moira/user.c $ $Id: user.c 4113 2013-05-28 14:29:10Z zacheiss $");
+RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/moira/user.c $ $Id: user.c 4114 2013-06-05 18:57:06Z zacheiss $");
void CorrectCapitalization(char **name);
char **AskUserInfo(char **info, Bool name);
@@ -706,7 +706,11 @@
Put_message("Aborted.");
return;
}
- if ((status = do_mr_query("update_user_account", CountArgs(args),
+
+ /* Subtract 2 from CountArgs() because affiliation fields are returned by
+ * get query but aren't exposed to update query.
+ */
+ if ((status = do_mr_query("update_user_account", CountArgs(args) - 2,
args, NULL, NULL)))
{
com_err(program_name, status, " in ModifyFields");
Modified: trunk/third/moira/debian/changelog
===================================================================
--- trunk/third/moira/debian/changelog 2013-06-02 22:22:21 UTC (rev 26031)
+++ trunk/third/moira/debian/changelog 2013-06-06 15:51:49 UTC (rev 26032)
@@ -1,3 +1,9 @@
+debathena-moira (4.0.0-r4114-0debathena1) unstable; urgency=low
+
+ * Re-import moira at r4114 to pick up bugfix
+
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 06 Jun 2013 11:51:32 -0400
+
debathena-moira (4.0.0-r4113-0debathena2) unstable; urgency=low
* Switch to dh7
