From 8e94402282c22471ef1dc56d9a24e105b623f136 Mon Sep 17 00:00:00 2001
From: John Supplee <john@supplee.com>
Date: Fri, 22 Nov 2019 17:13:57 +0200
Subject: [PATCH] Fix bug in displaying users when there is an archived user

---
 README.md                | 4 ++++
 management/mailconfig.py | 4 ++++
 setup/bootstrap.sh       | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0ced52c8..3f765c5f 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,10 @@ Issues
 Changes
 -------
 
+### v0.43-quota-0.22-beta
+
+* Fix bug that crashed user list when there is an archived user.
+
 ### v0.43-quota-0.21-beta
 
 * Remove extra features from the master branch
diff --git a/management/mailconfig.py b/management/mailconfig.py
index ee4bef2c..383b4cbc 100755
--- a/management/mailconfig.py
+++ b/management/mailconfig.py
@@ -198,6 +198,10 @@ def get_mail_users_ex(env, with_archived=False):
 						"privileges": [],
 						"status": "inactive",
 						"mailbox": mbox,
+                        "box_count": '?',
+                        "box_size": '?',
+                        "box_quota": '?',
+                        "percent": '?',
 					}
 					users.append(user)
 
diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh
index d9aad093..9eb65df5 100644
--- a/setup/bootstrap.sh
+++ b/setup/bootstrap.sh
@@ -20,7 +20,7 @@ if [ -z "$TAG" ]; then
 	# want to display in status checks.
 	if [ "`lsb_release -d | sed 's/.*:\s*//' | sed 's/18\.04\.[0-9]/18.04/' `" == "Ubuntu 18.04 LTS" ]; then
 		# This machine is running Ubuntu 18.04.
-		TAG=v0.43-quota-0.21-beta
+		TAG=v0.43-quota-0.22-beta
 
 	elif [ "`lsb_release -d | sed 's/.*:\s*//' | sed 's/14\.04\.[0-9]/14.04/' `" == "Ubuntu 14.04 LTS" ]; then
 		# This machine is running Ubuntu 14.04.