Quellcode durchsuchen

Merge pull request #18900 from icecrime/dirty_to_unsupported

Rename `-dirty` to `-unsupported`
Jess Frazelle vor 9 Jahren
Ursprung
Commit
d1b7d58e73
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
  1. 2 2
      hack/make.sh
  2. 1 1
      hack/make/build-rpm

+ 2 - 2
hack/make.sh

@@ -11,7 +11,7 @@ set -e
 # - The VERSION file, at the root of the repository, should exist, and
 # - The VERSION file, at the root of the repository, should exist, and
 #   will be used as Docker binary version and package version.
 #   will be used as Docker binary version and package version.
 # - The hash of the git commit will also be included in the Docker binary,
 # - The hash of the git commit will also be included in the Docker binary,
-#   with the suffix -dirty if the repository isn't clean.
+#   with the suffix -unsupported if the repository isn't clean.
 # - The script is intended to be run inside the docker container specified
 # - The script is intended to be run inside the docker container specified
 #   in the Dockerfile at the root of the source. In other words:
 #   in the Dockerfile at the root of the source. In other words:
 #   DO NOT CALL THIS SCRIPT DIRECTLY.
 #   DO NOT CALL THIS SCRIPT DIRECTLY.
@@ -68,7 +68,7 @@ VERSION=$(< ./VERSION)
 if command -v git &> /dev/null && git rev-parse &> /dev/null; then
 if command -v git &> /dev/null && git rev-parse &> /dev/null; then
 	GITCOMMIT=$(git rev-parse --short HEAD)
 	GITCOMMIT=$(git rev-parse --short HEAD)
 	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
 	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
-		GITCOMMIT="$GITCOMMIT-dirty"
+		GITCOMMIT="$GITCOMMIT-unsupported"
 	fi
 	fi
 	! BUILDTIME=$(date --rfc-3339 ns | sed -e 's/ /T/') &> /dev/null
 	! BUILDTIME=$(date --rfc-3339 ns | sed -e 's/ /T/') &> /dev/null
 	if [ -z $BUILDTIME ]; then
 	if [ -z $BUILDTIME ]; then

+ 1 - 1
hack/make/build-rpm

@@ -26,7 +26,7 @@ set -e
 
 
 	DOCKER_GITCOMMIT=$(git rev-parse --short HEAD)
 	DOCKER_GITCOMMIT=$(git rev-parse --short HEAD)
 	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
 	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
-		DOCKER_GITCOMMIT="$DOCKER_GITCOMMIT-dirty"
+		DOCKER_GITCOMMIT="$DOCKER_GITCOMMIT-unsupported"
 	fi
 	fi
 
 
 	# if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better
 	# if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better