Browse code

Merge pull request #18900 from icecrime/dirty_to_unsupported

Rename `-dirty` to `-unsupported`

Jess Frazelle authored on 2015/12/25 03:06:25
Showing 2 changed files
... ...
@@ -11,7 +11,7 @@ set -e
11 11
 # - The VERSION file, at the root of the repository, should exist, and
12 12
 #   will be used as Docker binary version and package version.
13 13
 # - The hash of the git commit will also be included in the Docker binary,
14
-#   with the suffix -dirty if the repository isn't clean.
14
+#   with the suffix -unsupported if the repository isn't clean.
15 15
 # - The script is intended to be run inside the docker container specified
16 16
 #   in the Dockerfile at the root of the source. In other words:
17 17
 #   DO NOT CALL THIS SCRIPT DIRECTLY.
... ...
@@ -68,7 +68,7 @@ VERSION=$(< ./VERSION)
68 68
 if command -v git &> /dev/null && git rev-parse &> /dev/null; then
69 69
 	GITCOMMIT=$(git rev-parse --short HEAD)
70 70
 	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
71
-		GITCOMMIT="$GITCOMMIT-dirty"
71
+		GITCOMMIT="$GITCOMMIT-unsupported"
72 72
 	fi
73 73
 	! BUILDTIME=$(date --rfc-3339 ns | sed -e 's/ /T/') &> /dev/null
74 74
 	if [ -z $BUILDTIME ]; then
... ...
@@ -26,7 +26,7 @@ set -e
26 26
 
27 27
 	DOCKER_GITCOMMIT=$(git rev-parse --short HEAD)
28 28
 	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
29
-		DOCKER_GITCOMMIT="$DOCKER_GITCOMMIT-dirty"
29
+		DOCKER_GITCOMMIT="$DOCKER_GITCOMMIT-unsupported"
30 30
 	fi
31 31
 
32 32
 	# if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better