When creating a new template and finding that it already exists in the...

When creating a new template and finding that it already exists in the database, ensure that a question of the same name exists too (closes: #518322, #779920).

Debconf/Template.pm

@@ -76,10 +76,15 @@ sub new {
 	if ($Debconf::Db::templates->exists($template) and
 	    $Debconf::Db::templates->owners($template)) {
 		# If a question matching this template already exists in
-		# the db, add the owner to it. This handles shared owner
-		# questions.
-		my $q=Debconf::Question->get($template);
-		$q->addowner($owner, $type) if $q;
+		# the db, add the owner to it; otherwise, create one. This
+		# handles shared owner questions.
+		if ($Debconf::Db::config->exists($template)) {
+			my $q=Debconf::Question->get($template);
+			$q->addowner($owner, $type) if $q;
+		} else {
+			my $q=Debconf::Question->new($template, $owner, $type);
+			$q->template($template);
+		}
 
 		# See if the template claims to own any questions that
 		# cannot be found. If so, the db is corrupted; attempt to

debian/changelog

@@ -6,6 +6,9 @@ debconf (1.5.57) UNRELEASED; urgency=medium
     supported gdialog for about three weeks in 1999 anyway.
   * Escape braces in regexes to avoid deprecation warning with Perl 5.22
     (closes: #786705).
+  * When creating a new template and finding that it already exists in the
+    database, ensure that a question of the same name exists too (closes:
+    #518322, #779920).
 
   [ Jérémy Bobbio ]
   * Use UTC when running xgettext for build reproducibility. Closes: #783255