Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 559636 - sys-apps/portage-2.2.20.1: repoman dies again when finding backup ~ files
Summary: sys-apps/portage-2.2.20.1: repoman dies again when finding backup ~ files
Status: RESOLVED FIXED
Alias: None
Product: Portage Development
Classification: Unclassified
Component: Repoman (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Portage team
URL:
Whiteboard:
Keywords: InVCS
Depends on:
Blocks:
 
Reported: 2015-09-05 07:55 UTC by Pacho Ramos
Modified: 2015-09-25 02:26 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Pacho Ramos gentoo-dev 2015-09-05 07:55:18 UTC
For some reason looks like bug 406877 has reappeared:
$ git add -- .
$ repoman full

RepoMan scours the neighborhood...
>>> Creating Manifest for /home/pacho/gentoo/app-office/wps-office
  file.name [fatal]             1
   /home/pacho/gentoo/app-office/wps-office/metadata.xml~: char '~'

Note: use --include-dev (-d) to check dependencies for 'dev' profiles

Please fix these important QA issues first.
RepoMan sez: "Make your QA payment on time and you'll never see the likes of me."


Thanks for your help :)
Comment 1 Mike Gilbert gentoo-dev 2015-09-05 12:45:55 UTC
Quoting zmedico from bug 406877:
> Maybe we can just use the regular expression from the file.name check for files to ignore. We can simply ignore those files if they haven't been explicitly added to the vcs.

When you run "git add -- .", you are adding the '~' files to the index -- that is to say, they have been "added to the vcs".

I would suggest adding "*~" to your ~/.config/git/ignore file. This will cause git to ignore any files ending with a tilde.
Comment 2 Pacho Ramos gentoo-dev 2015-09-05 13:00:29 UTC
Oh, thanks, I will try it :D
Comment 3 Pacho Ramos gentoo-dev 2015-09-05 13:51:12 UTC
It then dies a bit later with:
$ repoman commit -m "$(cat_pn): Version bump, fix dependencies and renderers switching (#554400 by xpue)"

RepoMan scours the neighborhood...
>>> Creating Manifest for /home/pacho/gentoo/media-plugins/gst-plugins-vaapi

Note: use --include-dev (-d) to check dependencies for 'dev' profiles

!!! The following files are in your local tree but are not added to the master
!!! tree. Please remove them from the local tree or add them to the master tree.
    ./metadata.xml~
Comment 4 Zac Medico gentoo-dev 2015-09-05 14:24:22 UTC
There's a patch in the following branch:

https://github.com/zmedico/portage/tree/bug_559636
Comment 5 Zac Medico gentoo-dev 2015-09-22 01:10:00 UTC
This is in the master branch now:

https://gitweb.gentoo.org/proj/portage.git/commit/?id=f5b1c404fe5c76abf34c291f4f1b4d8f52eb03b4
Comment 6 Brian Dolbec (RETIRED) gentoo-dev 2015-09-25 02:26:29 UTC
Released in portage-2.2.22