projects
/
osm
/
LCM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Bug 2208 KeyError while checking SDN assists requirement
[osm/LCM.git]
/
osm_lcm
/
lcm_utils.py
diff --git
a/osm_lcm/lcm_utils.py
b/osm_lcm/lcm_utils.py
index
4ec9d49
..
1854da7
100644
(file)
--- a/
osm_lcm/lcm_utils.py
+++ b/
osm_lcm/lcm_utils.py
@@
-118,7
+118,7
@@
def get_charm_artifact_path(base_folder, charm_name, charm_type, revision=str())
if base_folder.get("pkg-dir"):
artifact_path = "{}/{}/{}/{}".format(
if base_folder.get("pkg-dir"):
artifact_path = "{}/{}/{}/{}".format(
- base_folder["folder"] + extension,
+ base_folder["folder"]
.split(":")[0]
+ extension,
base_folder["pkg-dir"],
"charms"
if charm_type in ("native_charm", "lxc_proxy_charm", "k8s_proxy_charm")
base_folder["pkg-dir"],
"charms"
if charm_type in ("native_charm", "lxc_proxy_charm", "k8s_proxy_charm")
@@
-129,7
+129,7
@@
def get_charm_artifact_path(base_folder, charm_name, charm_type, revision=str())
else:
# For SOL004 packages
artifact_path = "{}/Scripts/{}/{}".format(
else:
# For SOL004 packages
artifact_path = "{}/Scripts/{}/{}".format(
- base_folder["folder"] + extension,
+ base_folder["folder"]
.split(":")[0]
+ extension,
"charms"
if charm_type in ("native_charm", "lxc_proxy_charm", "k8s_proxy_charm")
else "helm-charts",
"charms"
if charm_type in ("native_charm", "lxc_proxy_charm", "k8s_proxy_charm")
else "helm-charts",