| Summary: | repoman commit fails: Up-to-date check failed for `Manifest' | ||
|---|---|---|---|
| Product: | Portage Development | Reporter: | Peter Volkov (RETIRED) <pva> |
| Component: | Repoman | Assignee: | Portage team <dev-portage> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | Keywords: | InVCS, REGRESSION |
| Priority: | High | ||
| Version: | 2.2 | ||
| Hardware: | All | ||
| OS: | Linux | ||
| URL: | http://archives.gentoo.org/gentoo-dev/msg_ca845fbdcfa1ff4f43b0457eded16fa5.xml | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Bug Depends on: | |||
| Bug Blocks: | 210077, 216231 | ||
| Attachments: |
robbat2's demonstration of the cvs server bug triggered by a ./ prefix on file paths
strip the ./ prefix from file paths passed to cvs during commit |
||
|
Description
Peter Volkov (RETIRED)
2008-11-03 17:24:15 UTC
Weird, that error usually means the file you want to commit is not the latest revision available on the server. Are you sure you didn't run an `cvs update` in the middle somewhere? The only change that I did between two subsequent attempts to commit was downgrading of portage. If Manifest wasn't up-to-date then commit should fail in both cases. That's said, yes, I'm sure. I had same problem for dictd and I've removed directory completely and did cvs up and then update patch and back to this situation twice. In dictd case to workaround this issue I had to update ChangeLog first. But I don't think changes like this require ChangeLog entry. And think that this problem is reproducible, just add empty line to some patch in the tree, recreate manifest and I suppose you'll get this error. [tefnut:repomancheck/sys-apps/dummy] % cvs diff cvs diff: Diffing . Index: Manifest =================================================================== RCS file: /var/tmp/cvstest/repomancheck/sys-apps/dummy/Manifest,v retrieving revision 1.2 diff -u -r1.2 Manifest --- Manifest 3 Nov 2008 17:51:23 -0000 1.2 +++ Manifest 3 Nov 2008 17:52:21 -0000 @@ -1,4 +1,4 @@ -AUX dummy-0-stupid.patch 8 RMD160 b7698d91526ac8d5d27f4408fcc6d3afaa2feb31 SHA1 9fd2be4badf713d640ae46bf4547d1549654dfe5 SHA256 37406d190e1257cb5b61c7789ba3718599b9045d16698412bd191cd0348c452d +AUX dummy-0-stupid.patch 12 RMD160 298f21f6a56d9a13cc41160e95d0dae64fc48d46 SHA1 afc2e68e305db6fc98aa7456bc46e1c62bf1641b SHA256 5fa5085d5c2bb9f0eb399c212f5a2ca8de41d84f3d71d4a473a743e1d94b841e EBUILD dummy-0.ebuild 370 RMD160 e59da92b332a0ae0c2a4ea389253e950fbbc5268 SHA1 cfcdc4f8570b70a8824300277b9030801c619e26 SHA256 3d6ee9926af869373ef707d63b3664b24e00d0e3b35ee353974b421e18fbf7f9 MISC ChangeLog 333 RMD160 c846f2c4b5f649742918b7d9e4ee4eebd46ebb9c SHA1 b6f40a0e11a71d62a2d43dc630d288e14651fdd8 SHA256 51830a4453228b962cc4de15f2f987a56cc8821a8fa1d13dbf4b81aed36ec6fb MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 cvs diff: Diffing files Index: files/dummy-0-stupid.patch =================================================================== RCS file: /var/tmp/cvstest/repomancheck/sys-apps/dummy/files/dummy-0-stupid.patch,v retrieving revision 1.1 diff -u -r1.1 dummy-0-stupid.patch --- files/dummy-0-stupid.patch 3 Nov 2008 17:51:23 -0000 1.1 +++ files/dummy-0-stupid.patch 3 Nov 2008 17:52:14 -0000 @@ -1 +1,3 @@ bla bla + +bl [tefnut:repomancheck/sys-apps/dummy] % env PORTDIR_OVERLAY=/var/tmp/repomancheck repoman commit -m "modify patch" RepoMan scours the neighborhood... >>> Creating Manifest for /var/tmp/repomancheck/sys-apps/dummy ebuild.allmasked 1 sys-apps/dummy * 1 files being committed... 0 have headers that will change. * Files with headers will cause the manifests to be made and recommited. Using commit message: ------------------------------------------------------------------------------ modify patch (Portage version: 2.2.00.11799-prefix/cvs/Darwin 8.11.0 powerpc) ------------------------------------------------------------------------------ Checking in ./files/dummy-0-stupid.patch; /var/tmp/cvstest/repomancheck/sys-apps/dummy/files/dummy-0-stupid.patch,v <-- dummy-0-stupid.patch new revision: 1.2; previous revision: 1.1 done Checking in Manifest; /var/tmp/cvstest/repomancheck/sys-apps/dummy/Manifest,v <-- Manifest new revision: 1.3; previous revision: 1.2 done >>> Creating Manifest for /var/tmp/repomancheck/sys-apps/dummy Commit complete. RepoMan sez: "If everyone were like you, I'd be out of business!" [tefnut:repomancheck/sys-apps/dummy] % I thought my repoman "Manifest committed twice" patch went into _rc13, so there should be no difference between my repoman (like trunk) and the one in _rc13. Created attachment 171694 [details] robbat2's demonstration of the cvs server bug triggered by a ./ prefix on file paths This bug report seems to be the same problem discussed here: http://archives.gentoo.org/gentoo-dev/msg_ca845fbdcfa1ff4f43b0457eded16fa5.xml Created attachment 171695 [details, diff]
strip the ./ prefix from file paths passed to cvs during commit
I've tried this patch and it works. Thank you very much! Portage with this fix applied was released, so this bug is fixed. |