Common subdirectories: dak-1.0-deb/contrib and dak-1.0/contrib
Common subdirectories: dak-1.0-deb/debian and dak-1.0/debian
Common subdirectories: dak-1.0-deb/docs and dak-1.0/docs
Common subdirectories: dak-1.0-deb/examples and dak-1.0/examples
Common subdirectories: dak-1.0-deb/templates and dak-1.0/templates
Common subdirectories: dak-1.0-deb/test and dak-1.0/test
diff -u dak-1.0-deb/uma dak-1.0/uma
--- dak-1.0-deb/uma	2005-03-08 15:34:25.000000000 +0100
+++ dak-1.0/uma	2005-03-17 10:03:50.000000000 +0100
@@ -41,10 +41,10 @@
 Katie = None;
 Subst = None;
 
-re_gpg_fingerprint = re.compile(r"^\s+Key fingerprint = (.*)$", re.MULTILINE);
-# The next one is dirty
-re_user_address = re.compile(r"^.*<(.*)@.*>$", re.MULTILINE);
-re_user_mails = re.compile(r"^.*<(.*@.*)>$", re.MULTILINE);
+re_gpg_fingerprint = re.compile(r"^fpr:.*:.*:.*:.*:.*:.*:.*:.*:(.*):", re.MULTILINE);
+re_user_address = re.compile(r"^uid:.*:.*:.*:.*:.*:.*:.*:.*:.*<(.*)@.*>:", re.MULTILINE);
+re_user_name = re.compile(r"^uid:.*:.*:.*:.*:.*:.*:.*:.*:(.*<.*@.*>):", re.MULTILINE);
+re_user_mails = re.compile(r"^uid:.*:.*:.*:.*:.*:.*:.*:.*:.*<(.*@.*)>:", re.MULTILINE);
 
 ################################################################################
 
@@ -148,7 +148,7 @@
            % (Cnf["Dinstall::GPGKeyring"], Cnf["Uma::Options::Key"]);
     (result, output) = commands.getstatusoutput(cmd);
 
-    cmd = "gpg --no-secmem-warning --no-default-keyring --keyring=%s --keyring=%s --with-fingerprint --list-key %s" \
+    cmd = "gpg --no-secmem-warning --no-default-keyring --keyring=%s --keyring=%s --with-fingerprint --with-colons --fixed-list-mode --list-key %s" \
            % (Cnf["Dinstall::PGPKeyring"], Cnf["Dinstall::GPGKeyring"],
               Cnf["Uma::Options::Key"]);
     (result, output) = commands.getstatusoutput(cmd);
@@ -159,7 +159,6 @@
 					% (Cnf["Uma::Options::Key"], utils.prefix_multi_line_string(output, \
 																				" [GPG output:] ")));
     primary_key = m.group(1);
-    primary_key = primary_key.replace(" ","");
 
     uid = ""
     if Cnf.has_key("Uma::Options::User") and Cnf["Uma::Options::User"]:
@@ -171,7 +170,7 @@
             utils.fubar("0x%s: No userid found in gpg output but it returned 0?\n%s" \
                         % (Cnf["Uma::Options::Key"], utils.prefix_multi_line_string(output, " [GPG output:] ")));
         uid = u.group(1);
-    name = " ".join(output.split('\n')[0].split()[3:]);
+    name = re_user_name.search(output).group(1);
 
 # Look for all email addresses on the key.
     emails=[];
Common subdirectories: dak-1.0-deb/wanna-build and dak-1.0/wanna-build