From 1e62fe7d0d6b0e749fac8389dc5d28a15e4cf462 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 18 Mar 2008 21:22:53 +0000 Subject: Bug #174634 - Fix ebuild 'digest' and 'manifest' behave 100% identically and update the docs to reflect this. svn path=/main/trunk/; revision=9475 --- bin/ebuild | 2 +- bin/ebuild.sh | 2 +- man/ebuild.1 | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 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)" diff --git a/man/ebuild.1 b/man/ebuild.1 index 922c63bef..5fa2f8116 100644 --- 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" -- cgit v1.2.3-1-g7c22