From ab5d0d8e3aedf42c27f3e3e2015a8d38afb8f86b Mon Sep 17 00:00:00 2001
From: James Ennis <james.ennis@codethink.com>
Date: Wed, 23 Jan 2019 12:26:00 +0000
Subject: [PATCH] cli.py: Remove _classify_artifacts() method
This method has been moved to Stream, where is it used there exclusively.
---
buildstream/_frontend/cli.py | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/buildstream/_frontend/cli.py b/buildstream/_frontend/cli.py
index 5fcfe58c8e..d8a5b7d747 100644
--- a/buildstream/_frontend/cli.py
+++ b/buildstream/_frontend/cli.py
@@ -1,7 +1,6 @@
import os
import sys
from contextlib import ExitStack
-from fnmatch import fnmatch
from functools import partial
from tempfile import TemporaryDirectory
@@ -895,38 +894,6 @@ def workspace_list(app):
#############################################################
# Artifact Commands #
#############################################################
-def _classify_artifacts(names, cas, project_directory):
- element_targets = []
- artifact_refs = []
- element_globs = []
- artifact_globs = []
-
- for name in names:
- if name.endswith('.bst'):
- if any(c in "*?[" for c in name):
- element_globs.append(name)
- else:
- element_targets.append(name)
- else:
- if any(c in "*?[" for c in name):
- artifact_globs.append(name)
- else:
- artifact_refs.append(name)
-
- if element_globs:
- for dirpath, _, filenames in os.walk(project_directory):
- for filename in filenames:
- element_path = os.path.join(dirpath, filename).lstrip(project_directory).lstrip('/')
- if any(fnmatch(element_path, glob) for glob in element_globs):
- element_targets.append(element_path)
-
- if artifact_globs:
- artifact_refs.extend(ref for ref in cas.list_refs()
- if any(fnmatch(ref, glob) for glob in artifact_globs))
-
- return element_targets, artifact_refs
-
-
@cli.group(short_help="Manipulate cached artifacts")
def artifact():
"""Manipulate cached artifacts"""
--
GitLab