Bug #174634 - Fix ebuild 'digest' and 'manifest' behave 100% identically and

update the docs to reflect this.

svn path=/main/trunk/; revision=9475

2 files changed, 2 insertions, 2 deletions

diff --git a/bin/ebuild b/bin/ebuild
index 3554001fc..65afc660f 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -176,7 +176,7 @@ for arg in pargs:
 			stale_env_warning()
 			checked_for_stale_env = True
 
-		if arg == "digest" and force:
+		if arg in ("digest", "manifest") and force:
 			discard_digests(ebuild, tmpsettings, portage.portdb)
 		a = portage.doebuild(ebuild, arg, portage.root, tmpsettings,
 			debug=debug, tree=mytree)
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 30dd5c952..b522f8db0 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1043,7 +1043,7 @@ dyn_help() {
 	echo "  help        : show this help screen"
 	echo "  setup       : execute package specific setup actions"
 	echo "  fetch       : download source archive(s) and patches"
-	echo "  digest      : create a digest and a manifest file for the package"
+	echo "  digest      : create a manifest file for the package"
 	echo "  manifest    : create a manifest file for the package"
 	echo "  unpack      : unpack/patch sources (auto-fetch if needed)"
 	echo "  compile     : compile sources (auto-fetch/unpack if needed)"