projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release
[mirror/userdir-ldap.git]
/
ud-gpgsigfetch
diff --git
a/ud-gpgsigfetch
b/ud-gpgsigfetch
index
7e9ae13
..
4bca3cc
100755
(executable)
--- a/
ud-gpgsigfetch
+++ b/
ud-gpgsigfetch
@@
-1,7
+1,7
@@
#!/usr/bin/env python
# -*- mode: python -*-
#!/usr/bin/env python
# -*- mode: python -*-
-import
string,
re, time, ldap, getopt, sys, pwd, os;
+import re, time, ldap, getopt, sys, pwd, os;
from userdir_gpg import *;
Output = "extrakeys.gpg";
from userdir_gpg import *;
Output = "extrakeys.gpg";
@@
-20,14
+20,14
@@
if len(arguments) == 0:
Args = [GPGPath] + GPGBasicOptions;
for x in arguments:
Args.append("--keyring");
Args = [GPGPath] + GPGBasicOptions;
for x in arguments:
Args.append("--keyring");
- if
string.find(x,
"/") == -1:
+ if
x.find(
"/") == -1:
Args.append("./"+x);
else:
Args.append(x);
Args.append("--fast-list-mode");
Args.append("--list-sigs");
Args = Args + GPGSearchOptions + [" 2> /dev/null"]
Args.append("./"+x);
else:
Args.append(x);
Args.append("--fast-list-mode");
Args.append("--list-sigs");
Args = Args + GPGSearchOptions + [" 2> /dev/null"]
-Keys = os.popen(
string.join(Args," "
),"r");
+Keys = os.popen(
" ".join(Args
),"r");
# Loop over the GPG key file
HaveKeys = {};
# Loop over the GPG key file
HaveKeys = {};
@@
-38,7
+38,7
@@
while(1):
if Line == "":
break;
if Line == "":
break;
- Split =
string.split(Line,
":");
+ Split =
Line.split(
":");
if len(Split) >= 8 and Split[0] == "pub":
HaveKeys[Split[4]] = "";
continue;
if len(Split) >= 8 and Split[0] == "pub":
HaveKeys[Split[4]] = "";
continue;
@@
-52,13
+52,13
@@
Keys.close();
Args = [GPGPath] + GPGBasicOptions;
for x in [Output]:
Args.append("--keyring");
Args = [GPGPath] + GPGBasicOptions;
for x in [Output]:
Args.append("--keyring");
- if
string.find(x,
"/") == -1:
+ if
x.find(
"/") == -1:
Args.append("./"+x);
else:
Args.append(x);
OldArgs = Args;
Args = Args + GPGSearchOptions + [" 2> /dev/null"]
Args.append("./"+x);
else:
Args.append(x);
OldArgs = Args;
Args = Args + GPGSearchOptions + [" 2> /dev/null"]
-Keys = os.popen(
string.join(Args," "
),"r");
+Keys = os.popen(
" ".join(Args
),"r");
print "Reading keys from output ring";
while(1):
print "Reading keys from output ring";
while(1):
@@
-66,7
+66,7
@@
while(1):
if Line == "":
break;
if Line == "":
break;
- Split =
string.split(Line,
":");
+ Split =
Line.split(
":");
if len(Split) >= 8 and Split[0] == "pub":
HaveKeys[Split[4]] = "";
continue;
if len(Split) >= 8 and Split[0] == "pub":
HaveKeys[Split[4]] = "";
continue;
@@
-87,8
+87,8
@@
while (I > 0):
OldI = I;
I = I - 20;
if I < 0: I = 0;
OldI = I;
I = I - 20;
if I < 0: I = 0;
- print
string.join(Args+KeysToFetch[I:OldI]," "
)
- Fetcher = os.popen(
string.join(Args+KeysToFetch[I:OldI]," "
),"r");
+ print
" ".join(Args+KeysToFetch[I:OldI]
)
+ Fetcher = os.popen(
" ".join(Args+KeysToFetch[I:OldI]
),"r");
while(1):
Line = Fetcher.readline();
if Line == "":
while(1):
Line = Fetcher.readline();
if Line == "":