Merge ubiquity:lp1921567 into ubiquity:master

[Jean-Baptiste Lallement]

Do not try to escape non string dconf values and return immediately.

[Jean-Baptiste Lallement (jibel)]

Tested on Ubuntu and Kubuntu Hirsute Beta.

[Łukasz Zemczak (sil2100)]

Makes sense, +1. I wonder why this only now surfaced - is it because of the two added in the master key merge?

+ self.preseed('ubiquity/crypto_key', self.ui.get_crypto_keys())
+ self.preseed('ubiquity/recovery_key', self.ui.get_recovery_keys())

But I'd expect this to happen in the past already in this case. Oh well, still, let's get it fixed.

review: Approve

[Jean-Baptiste Lallement (jibel)]

It happened because the interface got the recovery key is not implemented on Kubuntu and the method returns a 'None' value.

diff --git a/debian/changelog b/debian/changelog
index 561d50f..f1a703a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ubiquity (21.04.13) UNRELEASED; urgency=medium
+
+  * misc: Fixed crash when trying to escape a non string (LP: #1921567)
+
+ -- Jean-Baptiste Lallement <[e-mail]>  Wed, 31 Mar 2021 10:39:43 +0200
+
 ubiquity (21.04.12) hirsute; urgency=medium
 
   [ Didier Roche ]
diff --git a/ubiquity/misc.py b/ubiquity/misc.py
index 72333e7..e7175cc 100644
--- a/ubiquity/misc.py
+++ b/ubiquity/misc.py
@@ -640,6 +640,8 @@ def format_size(size):
 
 
 def debconf_escape(text):
+    if type(text) is not str:
+        return text
     escaped = text.replace('\\', '\\\\').replace('\n', '\\n')
     return re.sub(r'(\s)', r'\\\1', escaped)