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

update the docs to reflect this. (trunk r9475)

svn path=/main/branches/2.1.2/; revision=9557

diff --git a/bin/ebuild b/bin/ebuild
index 07960fa0fb6411d6bb5061f495180bbc51fe9401..d6496f6fe84935970c7b9c263a618fa7ffaa6fa1 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -177,7 +177,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 6df1af492aefbb8eb73cdf679fe2bddb6dce58c2..395510fb6962bd4da47ccef931d7850cc7f2e09d 100755 (executable)
--- 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)"

diff --git a/man/ebuild.1 b/man/ebuild.1
index 922c63befac1262ef1b70c938bc71b1906cea3cf..5fa2f8116b819eee788dc13cf0088656e60994a9 100644 (file)
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -64,18 +64,17 @@ in files/digest\-[package]\-[version\-rev], a warning is printed
 and ebuild exits with an error code of 1.
 .TP
 .BR digest
-Creates a digest file for the package in
-/usr/portage/[category]/[package]/files/.  This digest file lists the
-checksums of all the files found in the SRC_URI. See the \fB\-\-force\fR
-option if you would like to prevent digests from being assumed. For further
-information regarding the behavior of this command, see the documentation for
-the \fIassume\-digests\fR value of the \fBFEATURES\fR variable in
-\fBmake.conf\fR(5).
+This is now equivalent to the \fImanifest\fR command.
 .TP
 .BR manifest
-Updates the manifest file for the package.  This performs the second half
-of the digest command, creating md5sums for the files in the files
-directory as well as the ebuild.
+Updates the manifest file for the package.  This creates checksums for all
+of the files found in the same directory as the current ebuild as well as
+the recursive contents of the files subdirectory. It also creates checksums
+for all of the files listed in SRC_URI for each ebuild. For further
+information regarding the behavior of this command, see the documentation for
+the \fIassume\-digests\fR value of the \fBFEATURES\fR variable in
+\fBmake.conf\fR(5). See the \fB\-\-force\fR option if you would like to
+prevent digests from being assumed. 
 .TP
 .BR unpack
 Extracts the sources to a subdirectory in the \fIbuild directory\fR
@@ -173,7 +172,8 @@ information is not incorporated into the RPM.
 .SH OPTIONS
 .TP
 \fB--force\fR
-When used together with the digest command, this option forces regeneration of
+When used together with the digest or manifest command,
+this option forces regeneration of
 digests for all distfiles associated with the current ebuild. Any distfiles
 that do not already exist in ${DISTDIR} will be automatically fetched.
 .SH "REPORTING BUGS"