Skip to content

Commit 80ea8b4

Browse files
authored
Jira WDT-15 - Prepend local package path to avoid conflicts with pwd; don't prepend for Jython tools (#682)
1 parent 493c461 commit 80ea8b4

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

core/src/main/python/create.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
from oracle.weblogic.deploy.util import WLSDeployArchiveIOException
1818
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
1919

20-
sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
20+
sys.path.insert(0, os.path.dirname(os.path.realpath(sys.argv[0])))
2121

2222
# imports from local packages start here
23-
2423
from wlsdeploy.aliases.aliases import Aliases
2524
from wlsdeploy.aliases import model_constants
2625
from wlsdeploy.aliases.model_constants import DEFAULT_WLS_DOMAIN_NAME

core/src/main/python/deploy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from oracle.weblogic.deploy.util import CLAException
1717
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
1818

19-
sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
19+
sys.path.insert(0, os.path.dirname(os.path.realpath(sys.argv[0])))
2020

2121
# imports from local packages start here
2222
from wlsdeploy.aliases.aliases import Aliases

core/src/main/python/discover.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
2323
from oracle.weblogic.deploy.validate import ValidateException
2424

25-
sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
25+
sys.path.insert(0, os.path.dirname(os.path.realpath(sys.argv[0])))
2626

2727
from wlsdeploy.aliases import model_constants
2828
from wlsdeploy.aliases.aliases import Aliases

core/src/main/python/encrypt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from oracle.weblogic.deploy.util import VariableException
1919
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
2020

21-
sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
21+
# Jython tools don't require sys.path modification
2222

2323
# imports from local packages start here
2424
from wlsdeploy.aliases.aliases import Aliases

core/src/main/python/extract_resource.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from oracle.weblogic.deploy.util import CLAException
1212
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
1313

14-
sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
14+
# Jython tools don't require sys.path modification
1515

1616
# imports from local packages start here
1717
from wlsdeploy.aliases.aliases import Aliases

core/src/main/python/model_help.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from oracle.weblogic.deploy.util import CLAException
1010
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
1111

12-
sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
12+
# Jython tools don't require sys.path modification
1313

1414
from wlsdeploy.aliases.aliases import Aliases
1515
from wlsdeploy.exception import exception_helper

core/src/main/python/prepare_model.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
2828
from oracle.weblogic.deploy.validate import ValidateException
2929

30+
# Jython tools don't require sys.path modification
31+
3032
from wlsdeploy.aliases.aliases import Aliases
3133
from wlsdeploy.aliases.location_context import LocationContext
3234
from wlsdeploy.aliases.model_constants import ADMIN_USERNAME

core/src/main/python/update.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from oracle.weblogic.deploy.util import CLAException
1616
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
1717

18-
sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
18+
sys.path.insert(0, os.path.dirname(os.path.realpath(sys.argv[0])))
1919

2020
# imports from local packages start here
2121
from wlsdeploy.aliases.aliases import Aliases

core/src/main/python/validate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from oracle.weblogic.deploy.logging import SummaryHandler
1919

20-
sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
20+
# Jython tools don't require sys.path modification
2121

2222
# imports from local packages start here
2323
from wlsdeploy.aliases.wlst_modes import WlstModes

core/src/main/python/variable_inject.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
55
The entry point for the injectVariables tool.
66
"""
7-
import os
87
import sys
98

109
from java.io import File
@@ -15,7 +14,7 @@
1514
from oracle.weblogic.deploy.util import WLSDeployArchiveIOException
1615
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
1716

18-
sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
17+
# Jython tools don't require sys.path modification
1918

2019
import wlsdeploy.tool.util.variable_injector as variable_injector
2120
from wlsdeploy.aliases.wlst_modes import WlstModes

0 commit comments

Comments
 (0)