From peter at palfrader.org  Sun Apr  5 23:34:27 2009
From: peter at palfrader.org (Peter Palfrader)
Date: Mon, 06 Apr 2009 01:34:27 +0200
Subject: [Da-tools-commits] ./debian/userdir-ldap r512: userdir-ldap.conf:
 add keyring.pgp to default add_keyrings
Message-ID: <E1Lqbwn-0002rj-3u@alioth.debian.org>

------------------------------------------------------------
revno: 512
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Mon 2009-04-06 01:34:27 +0200
message:
  userdir-ldap.conf: add keyring.pgp to default add_keyrings
modified:
  debian/changelog
  userdir-ldap.conf
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2009-03-23 11:39:49 +0000
+++ b/debian/changelog	2009-04-05 23:34:27 +0000
@@ -1,3 +1,9 @@
+userdir-ldap (0.3.64) unstable; urgency=low
+
+  * userdir-ldap.conf: add keyring.pgp to default add_keyrings.
+
+ -- Peter Palfrader <weasel at debian.org>  Mon, 06 Apr 2009 01:33:51 +0200
+
 userdir-ldap (0.3.63) unstable; urgency=low
 
   * Print gpg's exit status when it fails.

=== modified file 'userdir-ldap.conf'
--- a/userdir-ldap.conf	2008-11-23 20:23:20 +0000
+++ b/userdir-ldap.conf	2009-04-05 23:34:27 +0000
@@ -49,7 +49,7 @@
 # Keyrings synced to other machines, if they need them
 sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp";
 # Keyrings used to search in when new developers get added
-add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp"
 
 # For the WEB interface
 webloginhtml = "login.html";


From peter at palfrader.org  Sun Apr  5 23:35:26 2009
From: peter at palfrader.org (Peter Palfrader)
Date: Mon, 06 Apr 2009 01:35:26 +0200
Subject: [Da-tools-commits] ./debian/userdir-ldap r514: ud-gpgimport: work
 on add_keyrings if no keyrings are given on the command line
Message-ID: <E1Lqbwn-0002rj-GB@alioth.debian.org>

------------------------------------------------------------
revno: 514
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Mon 2009-04-06 01:35:26 +0200
message:
  ud-gpgimport: work on add_keyrings if no keyrings are given on the command line
modified:
  debian/changelog
  ud-gpgimport
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2009-04-05 23:35:02 +0000
+++ b/debian/changelog	2009-04-05 23:35:26 +0000
@@ -2,8 +2,10 @@
 
   * userdir-ldap.conf: add keyring.pgp to default add_keyrings.
   * userdir_gpg.py: add a ClearKeyrings().
+  * ud-gpgimport: work on add_keyrings if no keyrings are given on the
+    command line.
 
- -- Peter Palfrader <weasel at debian.org>  Mon, 06 Apr 2009 01:34:39 +0200
+ -- Peter Palfrader <weasel at debian.org>  Mon, 06 Apr 2009 01:35:12 +0200
 
 userdir-ldap (0.3.63) unstable; urgency=low
 

=== modified file 'ud-gpgimport'
--- a/ud-gpgimport	2008-05-23 21:52:29 +0000
+++ b/ud-gpgimport	2009-04-05 23:35:26 +0000
@@ -62,9 +62,7 @@
        LoadOverride(val);
    elif (switch == '-a'):
        NoAct = 0;
-if len(arguments) == 0:
-   print "Give some keyrings to probe";
-   sys.exit(0);
+
 
 # Main program starts here
 
@@ -105,14 +103,16 @@
 print;
 
 # Popen GPG with the correct magic special options
-Args = [GPGPath] + GPGBasicOptions;
+ClearKeyrings()
+if len(arguments) == 0:
+   print "Using default keyrings: %s"%ConfModule.add_keyrings;
+   SetKeyrings(ConfModule.add_keyrings.split(":"))
 for x in arguments:
-   Args.append("--keyring");
    if x.find("/") == -1:
-      Args.append("./"+x);
-   else:
-      Args.append(x);
-Args = Args + GPGSearchOptions + [" 2> /dev/null"]
+      x= "./"+x
+   SetKeyrings( [x] )
+
+Args = [GPGPath] + GPGBasicOptions + GPGKeyRings + GPGSearchOptions + [" 2> /dev/null"]
 Keys = os.popen(" ".join(Args),"r");
 
 # Loop over the GPG key file


From peter at palfrader.org  Sun Apr  5 23:35:02 2009
From: peter at palfrader.org (Peter Palfrader)
Date: Mon, 06 Apr 2009 01:35:02 +0200
Subject: [Da-tools-commits] ./debian/userdir-ldap r513: userdir_gpg.py: add
	a ClearKeyrings()
Message-ID: <E1Lqbwn-0002rj-8u@alioth.debian.org>

------------------------------------------------------------
revno: 513
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Mon 2009-04-06 01:35:02 +0200
message:
  userdir_gpg.py: add a ClearKeyrings()
modified:
  debian/changelog
  userdir_gpg.py
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2009-04-05 23:34:27 +0000
+++ b/debian/changelog	2009-04-05 23:35:02 +0000
@@ -1,8 +1,9 @@
 userdir-ldap (0.3.64) unstable; urgency=low
 
   * userdir-ldap.conf: add keyring.pgp to default add_keyrings.
+  * userdir_gpg.py: add a ClearKeyrings().
 
- -- Peter Palfrader <weasel at debian.org>  Mon, 06 Apr 2009 01:33:51 +0200
+ -- Peter Palfrader <weasel at debian.org>  Mon, 06 Apr 2009 01:34:39 +0200
 
 userdir-ldap (0.3.63) unstable; urgency=low
 

=== modified file 'userdir_gpg.py'
--- a/userdir_gpg.py	2009-03-23 11:39:49 +0000
+++ b/userdir_gpg.py	2009-04-05 23:35:02 +0000
@@ -52,6 +52,9 @@
 AgeCutOff = 4*24*60*60;
 FutureCutOff = 3*24*60*60;
 
+def ClearKeyrings():
+   del GPGKeyRings[:]
+
 # Set the keyrings, the input is a list of keyrings
 def SetKeyrings(Rings):
    for x in Rings:


From peter at palfrader.org  Sun Apr  5 23:41:05 2009
From: peter at palfrader.org (Peter Palfrader)
Date: Mon, 06 Apr 2009 01:41:05 +0200
Subject: [Da-tools-commits] ./debian/userdir-ldap r515: userdir-ldap.conf:
	remove from default keyrings:
Message-ID: <E1Lqc1b-0004Gg-P5@alioth.debian.org>

------------------------------------------------------------
revno: 515
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Mon 2009-04-06 01:41:05 +0200
message:
  userdir-ldap.conf: remove from default keyrings:
   - /home/jgg/keys/extrakeys.gpg
   - /home/jgg/keys/guest-keys.gpg
modified:
  debian/changelog
  userdir-ldap.conf
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2009-04-05 23:35:26 +0000
+++ b/debian/changelog	2009-04-05 23:41:05 +0000
@@ -1,3 +1,11 @@
+userdir-ldap (0.3.65) unstable; urgency=low
+
+  * userdir-ldap.conf: remove from default keyrings:
+    - /home/jgg/keys/extrakeys.gpg
+    - /home/jgg/keys/guest-keys.gpg
+
+ -- Peter Palfrader <weasel at debian.org>  Mon, 06 Apr 2009 01:40:37 +0200
+
 userdir-ldap (0.3.64) unstable; urgency=low
 
   * userdir-ldap.conf: add keyring.pgp to default add_keyrings.

=== modified file 'userdir-ldap.conf'
--- a/userdir-ldap.conf	2009-04-05 23:34:27 +0000
+++ b/userdir-ldap.conf	2009-04-05 23:41:05 +0000
@@ -45,9 +45,9 @@
 # GPG Things
 gpg = "/usr/bin/gpg";
 # The whole set of all keyrings
-keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/removed-keys.gpg:/org/keyring.debian.org/keyrings/removed-keys.pgp:/home/jgg/keys/extrakeys.gpg:/home/jgg/keys/guest-keys.gpg";
+keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/removed-keys.gpg:/org/keyring.debian.org/keyrings/removed-keys.pgp"
 # Keyrings synced to other machines, if they need them
-sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp";
+sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp"
 # Keyrings used to search in when new developers get added
 add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp"