containers-common-1-55.el9

- fix vendoring script
- Related: #2176063

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

containers-common.spec

@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 54%{?dist}
+Release: 55%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 ExclusiveArch: %{go_arches}
@@ -173,6 +173,10 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Wed Jul 19 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-55
+- fix vendoring script
+- Related: #2176063
+
 * Mon Jul 10 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-54
 - update vendored components
 - Related: #2176063

update-vendored.sh

@@ -7,20 +7,23 @@ CENTOS=""
 pwd | grep /tmp/centos > /dev/null
 if [ $? == 0 ]; then
   CENTOS=1
+  PKG=centpkg
+else
+  PKG=rhpkg
 fi
 set -e
 for P in podman skopeo buildah; do
   BRN=`pwd | sed 's,^.*/,,'`
   rm -rf $P
-  pkg clone $P
+  $PKG clone $P
   cd $P
-  [ -z "$CENTOS" ] && pkg switch-branch $BRN
+  $PKG switch-branch $BRN
   if [ $BRN != stream-container-tools-rhel8 ]; then
-    pkg prep
+    $PKG prep
   else
-    pkg --release rhel-8 prep
+    $PKG --release rhel-8 prep
   fi
-  DIR=`ls -d -- */ | grep -v ^tests | head -n1`
+  DIR=`ls -d -- */ | grep "^$P"`
   grep github.com/containers/image $DIR/go.mod | cut -d\  -f2 | sed 's,-.*,,'>> /tmp/ver_image
   grep github.com/containers/common $DIR/go.mod | cut -d\  -f2 | sed 's,-.*,,' >> /tmp/ver_common
   grep github.com/containers/storage $DIR/go.mod | cut -d\  -f2 | sed 's,-.*,,' >> /tmp/ver_storage