From: John Mulligan <jmulligan@redhat.com>
Date: Tue, 5 Sep 2023 18:18:45 +0000 (-0400)
Subject: cephadm: remove duplicates when listing files in scan
X-Git-Tag: v19.0.0~478^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=15a3d93bc87fa9145de8349e1f28693b27056ef7;p=ceph.git

cephadm: remove duplicates when listing files in scan

Fix running tox env flake8 during a rebase/merge where git ls-files
may return duplicate file names.

An earlier version of this change used the `--deuplicate` option to `git
ls-files` in order to remove duplicate files listed when running the
tool during rebase/merge. Mysteriously, this seemed to break the `ceph
API tests` in the CI. A completely unrelated command in a tox file that,
AFAIK, is not executed in that test suite. They ways of git are
subtle and often sucky.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---

diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini
index 2845124afd40..266520ff5727 100644
--- a/src/cephadm/tox.ini
+++ b/src/cephadm/tox.ini
@@ -62,7 +62,7 @@ deps =
     flake8-quotes
 commands =
     flake8 --config=tox.ini {posargs:cephadm.py cephadmlib}
-    bash -c 'test $(git ls-files 'cephadm.py' 'cephadmlib/*.py' | xargs grep "docker.io" | wc -l) == 11'
+    bash -c 'test $(git ls-files 'cephadm.py' 'cephadmlib/*.py' | sort -u | xargs grep "docker.io" | wc -l) == 11'
 # Downstream distributions may choose to alter this "docker.io" number,
 # to make sure no new references to docker.io are creeping in unnoticed.