openstack/oslo.rootwrap
Code Issues Proposed changes

Remove sys.path modification

Browse Source 
Since (almost) all our projects are already using console_scripts even
for testing and this code is "backdoor in the waiting" (as Thierry
said), this code should be thrown away.

Change-Id: I8a7ac057b2251f9ae0d78d1f3f7943f4627fe248
This commit is contained in:
Yuriy Taraday
2014-07-22 23:46:01 +04:00
parent 5fb3475fac
commit e2e0c03f5a
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
oslo/rootwrap/cmd.py
View File

@@ -41,6 +41,8 @@ import sys
from six import moves from six import moves
from oslo.rootwrap import wrapper
RC_UNAUTHORIZED = 99 RC_UNAUTHORIZED = 99
RC_NOCOMMAND = 98 RC_NOCOMMAND = 98
RC_BADCONFIG = 97 RC_BADCONFIG = 97
@@ -78,14 +80,6 @@ def main():
configfile = sys.argv.pop(0) configfile = sys.argv.pop(0)
userargs = sys.argv[:] userargs = sys.argv[:]
# Add ../ to sys.path to allow running from branch
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(execname),
os.pardir, os.pardir))
if os.path.exists(os.path.join(possible_topdir, "oslo", "__init__.py")):
sys.path.insert(0, possible_topdir)
from oslo.rootwrap import wrapper
# Load configuration # Load configuration
try: try:
rawconfig = moves.configparser.RawConfigParser() rawconfig = moves.configparser.RawConfigParser()