From f54d08c82ed43f0298349dea6ba9d8e58d4dbae5 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Wed, 7 Feb 2007 04:35:50 +0000 Subject: [PATCH] merge changes from head --- PLC/GPG.py | 4 ++-- PLC/Methods/SliceGetTicket.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PLC/GPG.py b/PLC/GPG.py index f351f27..13e5585 100644 --- a/PLC/GPG.py +++ b/PLC/GPG.py @@ -7,7 +7,7 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: GPG.py,v 1.4 2007/01/10 20:18:52 mlhuang Exp $ +# $Id: GPG.py,v 1.6 2007/02/07 04:35:19 mlhuang Exp $ # import os @@ -55,7 +55,7 @@ def gpg_export(keyring, armor = True): 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() diff --git a/PLC/Methods/SliceGetTicket.py b/PLC/Methods/SliceGetTicket.py index 33043ca..64413c9 100644 --- a/PLC/Methods/SliceGetTicket.py +++ b/PLC/Methods/SliceGetTicket.py @@ -236,7 +236,7 @@ class SliceGetTicket(GetSliceTicket): p = Popen(["xmlsec1", "--sign", "--privkey-pem", self.api.config.PLC_API_TICKET_KEY, ticket.name], - stdin = PIPE, stdout = PIPE, stderr = PIPE) + stdin = PIPE, stdout = PIPE, stderr = PIPE, close_fds = True) signed_ticket = p.stdout.read() err = p.stderr.read() rc = p.wait() -- 2.43.0