Browse Source

Require manpages for packages.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 1ea9c19ffe53811931ecd3102703c3eacb22d14c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Daniel Nephin 9 years ago
parent
commit
5b667c7c55
2 changed files with 2 additions and 4 deletions
  1. 1 2
      hack/make/build-deb
  2. 1 2
      hack/make/build-rpm

+ 1 - 2
hack/make/build-deb

@@ -35,8 +35,7 @@ set -e
 	debDate="$(date --rfc-2822)"
 	debDate="$(date --rfc-2822)"
 
 
 	# if go-md2man is available, pre-generate the man pages
 	# if go-md2man is available, pre-generate the man pages
-	make manpages || true
-	# TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this
+	make manpages
 
 
 	builderDir="contrib/builder/deb/${PACKAGE_ARCH}"
 	builderDir="contrib/builder/deb/${PACKAGE_ARCH}"
 	pkgs=( $(find "${builderDir}/"*/ -type d) )
 	pkgs=( $(find "${builderDir}/"*/ -type d) )

+ 1 - 2
hack/make/build-rpm

@@ -51,8 +51,7 @@ set -e
 	rpmDate="$(date +'%a %b %d %Y')"
 	rpmDate="$(date +'%a %b %d %Y')"
 
 
 	# if go-md2man is available, pre-generate the man pages
 	# if go-md2man is available, pre-generate the man pages
-	make manpages || true
-	# TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this
+	make manpages
 
 
 	# Convert the CHANGELOG.md file into RPM changelog format
 	# Convert the CHANGELOG.md file into RPM changelog format
 	VERSION_REGEX="^\W\W (.*) \((.*)\)$"
 	VERSION_REGEX="^\W\W (.*) \((.*)\)$"