| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-28 12:10:37 +0000 (Fri, 28 Mar 2008) |
| 3 |
New Revision: 9557 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/ebuild |
| 7 |
main/branches/2.1.2/bin/ebuild.sh |
| 8 |
main/branches/2.1.2/man/ebuild.1 |
| 9 |
Log: |
| 10 |
Bug #174634 - Fix ebuild 'digest' and 'manifest' behave 100% identically and |
| 11 |
update the docs to reflect this. (trunk r9475) |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/branches/2.1.2/bin/ebuild |
| 15 |
=================================================================== |
| 16 |
--- main/branches/2.1.2/bin/ebuild 2008-03-28 12:08:27 UTC (rev 9556) |
| 17 |
+++ main/branches/2.1.2/bin/ebuild 2008-03-28 12:10:37 UTC (rev 9557) |
| 18 |
@@ -177,7 +177,7 @@ |
| 19 |
stale_env_warning() |
| 20 |
checked_for_stale_env = True |
| 21 |
|
| 22 |
- if arg == "digest" and force: |
| 23 |
+ if arg in ("digest", "manifest") and force: |
| 24 |
discard_digests(ebuild, tmpsettings, portage.portdb) |
| 25 |
a = portage.doebuild(ebuild, arg, portage.root, tmpsettings, |
| 26 |
debug=debug, tree=mytree) |
| 27 |
|
| 28 |
Modified: main/branches/2.1.2/bin/ebuild.sh |
| 29 |
=================================================================== |
| 30 |
--- main/branches/2.1.2/bin/ebuild.sh 2008-03-28 12:08:27 UTC (rev 9556) |
| 31 |
+++ main/branches/2.1.2/bin/ebuild.sh 2008-03-28 12:10:37 UTC (rev 9557) |
| 32 |
@@ -1043,7 +1043,7 @@ |
| 33 |
echo " help : show this help screen" |
| 34 |
echo " setup : execute package specific setup actions" |
| 35 |
echo " fetch : download source archive(s) and patches" |
| 36 |
- echo " digest : create a digest and a manifest file for the package" |
| 37 |
+ echo " digest : create a manifest file for the package" |
| 38 |
echo " manifest : create a manifest file for the package" |
| 39 |
echo " unpack : unpack/patch sources (auto-fetch if needed)" |
| 40 |
echo " compile : compile sources (auto-fetch/unpack if needed)" |
| 41 |
|
| 42 |
Modified: main/branches/2.1.2/man/ebuild.1 |
| 43 |
=================================================================== |
| 44 |
--- main/branches/2.1.2/man/ebuild.1 2008-03-28 12:08:27 UTC (rev 9556) |
| 45 |
+++ main/branches/2.1.2/man/ebuild.1 2008-03-28 12:10:37 UTC (rev 9557) |
| 46 |
@@ -64,19 +64,18 @@ |
| 47 |
and ebuild exits with an error code of 1. |
| 48 |
.TP |
| 49 |
.BR digest |
| 50 |
-Creates a digest file for the package in |
| 51 |
-/usr/portage/[category]/[package]/files/. This digest file lists the |
| 52 |
-checksums of all the files found in the SRC_URI. See the \fB\-\-force\fR |
| 53 |
-option if you would like to prevent digests from being assumed. For further |
| 54 |
+This is now equivalent to the \fImanifest\fR command. |
| 55 |
+.TP |
| 56 |
+.BR manifest |
| 57 |
+Updates the manifest file for the package. This creates checksums for all |
| 58 |
+of the files found in the same directory as the current ebuild as well as |
| 59 |
+the recursive contents of the files subdirectory. It also creates checksums |
| 60 |
+for all of the files listed in SRC_URI for each ebuild. For further |
| 61 |
information regarding the behavior of this command, see the documentation for |
| 62 |
the \fIassume\-digests\fR value of the \fBFEATURES\fR variable in |
| 63 |
-\fBmake.conf\fR(5). |
| 64 |
+\fBmake.conf\fR(5). See the \fB\-\-force\fR option if you would like to |
| 65 |
+prevent digests from being assumed. |
| 66 |
.TP |
| 67 |
-.BR manifest |
| 68 |
-Updates the manifest file for the package. This performs the second half |
| 69 |
-of the digest command, creating md5sums for the files in the files |
| 70 |
-directory as well as the ebuild. |
| 71 |
-.TP |
| 72 |
.BR unpack |
| 73 |
Extracts the sources to a subdirectory in the \fIbuild directory\fR |
| 74 |
(BUILD_PREFIX) by running the \fIsrc_unpack()\fR function in the ebuild |
| 75 |
@@ -173,7 +172,8 @@ |
| 76 |
.SH OPTIONS |
| 77 |
.TP |
| 78 |
\fB--force\fR |
| 79 |
-When used together with the digest command, this option forces regeneration of |
| 80 |
+When used together with the digest or manifest command, |
| 81 |
+this option forces regeneration of |
| 82 |
digests for all distfiles associated with the current ebuild. Any distfiles |
| 83 |
that do not already exist in ${DISTDIR} will be automatically fetched. |
| 84 |
.SH "REPORTING BUGS" |
| 85 |
|
| 86 |
-- |
| 87 |
gentoo-commits@l.g.o mailing list |
Archives