git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svn merge -c 8998 ./branches/dummynet-4.2-2 ./trunk/
[plcapi.git]
/
PLC
/
GPG.py
diff --git
a/PLC/GPG.py
b/PLC/GPG.py
index
f351f27
..
2499bab
100644
(file)
--- a/
PLC/GPG.py
+++ b/
PLC/GPG.py
@@
-7,7
+7,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id
: GPG.py,v 1.4 2007/01/10 20:18:52 mlhuang Exp
$
+# $Id$
#
import os
#
import os
@@
-55,7
+55,7
@@
def gpg_export(keyring, armor = True):
if armor:
args.append("--armor")
if armor:
args.append("--armor")
- p = Popen(args, stdin = PIPE, stdout = PIPE, stderr = PIPE)
+ p = Popen(args, stdin = PIPE, stdout = PIPE, stderr = PIPE
, close_fds = True
)
export = p.stdout.read()
err = p.stderr.read()
rc = p.wait()
export = p.stdout.read()
err = p.stderr.read()
rc = p.wait()