Do not detach a new package even if it comes from external source

This commit is contained in:
Ivan Kravets committed 2020-08-28 21:24:48 +03:00
1 parent cdbb837948
commit 9f2c134e44
4 files changed
+29 -23

No files matched your search

+13 -14
View File
@@ -180,20 +180,19 @@ class PackageManagerInstallMixin(object):
dst_pkg = PackageItem(
os.path.join(self.package_dir, tmp_pkg.metadata.spec.name)
)
elif dst_pkg.metadata and dst_pkg.metadata.spec.external:
if dst_pkg.metadata.spec.url != tmp_pkg.metadata.spec.url:
action = "detach-existing"
elif tmp_pkg.metadata.spec.external:
action = "detach-new"
elif dst_pkg.metadata and (
dst_pkg.metadata.version != tmp_pkg.metadata.version
or dst_pkg.metadata.spec.owner != tmp_pkg.metadata.spec.owner
):
action = (
"detach-existing"
if tmp_pkg.metadata.version > dst_pkg.metadata.version
else "detach-new"
)
elif dst_pkg.metadata:
if dst_pkg.metadata.spec.external:
if dst_pkg.metadata.spec.url != tmp_pkg.metadata.spec.url:
action = "detach-existing"
elif (
dst_pkg.metadata.version != tmp_pkg.metadata.version
or dst_pkg.metadata.spec.owner != tmp_pkg.metadata.spec.owner
):
action = (
"detach-existing"
if tmp_pkg.metadata.version > dst_pkg.metadata.version
else "detach-new"
)
def _cleanup_dir(path):
if os.path.isdir(path):
+1 -1
View File
@@ -154,7 +154,7 @@ class MeasurementProtocol(TelemetryBase):
"project",
"settings",
"system",
"team"
"team",
):
cmd_path = args[:2]
if args[0] == "lib" and len(args) > 1: