Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 11763 - Auto-merging unmodified protected files
Summary: Auto-merging unmodified protected files
Status: RESOLVED LATER
Alias: None
Product: Portage Development
Classification: Unclassified
Component: Core (show other bugs)
Hardware: x86 Linux
: Low enhancement (vote)
Assignee: Portage team
URL:
Whiteboard:
Keywords:
: 7737 25478 26620 47643 101520 117780 (view as bug list)
Depends on: 4709 7737
Blocks: 17403
  Show dependency tree
 
Reported: 2002-12-08 06:36 UTC by Ian Goldby
Modified: 2011-10-30 22:37 UTC (History)
9 users (show)

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


Attachments
Patch to add optional CONFIG_PROTECT override on unedited files (portage.py-diff,565 bytes, patch)
2003-07-31 15:38 UTC, William Totten
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Ian Goldby 2002-12-08 06:36:38 UTC
Editing protected config files after a long update can be tedious and    
computers were supposed to save us from this kind of drugery 8-)    
    
(My first request is covered in bug 4709 - if a config file has not been    
edited by the user, then it should be overwritten. This still doesn't work as 
of Portage 2.0.45.)    
    
My main request is for a CVS-like merge facility, so that Portage deals with    
edited files in CONFIG_PROTECT directories in the same way as cvs update.  
Portage would have to keep a mirror of all files that were put in the 
protected config directories. Then, on updating a config file, it would diff 
the existing file with the mirrored (original) file, and apply the differences 
to the new config file. Where the differences raised a conflict, I suppose it 
should put in the two versions a la CVS, separated by <<<<<<< ======== >>>>>>> 
markers (like CVS), and then save the file as ._cfg????_* and alert the user 
as at present. 
    
I think this would largely remove the need to maintain configuration files    
manually, and in those cases where conficts occur it would be much easier to    
see what has changed and fix the file accordingly.   
    
Thanks.
Comment 1 Ian Goldby 2002-12-17 17:53:05 UTC
(Re: bug 4709 - I think the Freenet example given is just an anomoly and 
probably updating of uncustomised config files *does* work usually. My 
apologies. Scratch the 2nd paragraph of the request, but leave the rest.) 
Comment 2 Ian Goldby 2002-12-30 15:15:22 UTC
Ok, I'm being annoying 8-) 
 
I just did an emerge system and ended up with 44 config files that needed 
attention. The thing is, almost all of them were unmodified from the 
originals. So put that 2nd paragraph back in... 
Comment 3 SpanKY gentoo-dev 2003-07-28 21:15:22 UTC
*** Bug 25478 has been marked as a duplicate of this bug. ***
Comment 4 William Totten 2003-07-31 15:38:24 UTC
Created attachment 15301 [details, diff]
Patch to add optional CONFIG_PROTECT override on unedited files

Attaching the patch as I would solve this problem in a optional fashion from my

duplicate bug #25478.
Patch also available at:  http://drumlin.thehutt.org/portage/portage.py-diff
Comment 5 SpanKY gentoo-dev 2003-08-14 16:27:03 UTC
*** Bug 26620 has been marked as a duplicate of this bug. ***
Comment 6 Martin Holzer (RETIRED) gentoo-dev 2003-10-15 12:03:05 UTC
*** Bug 7737 has been marked as a duplicate of this bug. ***
Comment 7 Nicholas Jones (RETIRED) gentoo-dev 2004-04-11 00:47:08 UTC
If you want RCCS features then look at dispatch-conf
and the related patches on bugs.gentoo.org.
Comment 8 Niels Teglsbo 2004-05-30 16:58:09 UTC
*** Bug 47643 has been marked as a duplicate of this bug. ***
Comment 9 mark lybarger 2005-04-13 20:06:22 UTC
i'm interested in this feature. i want portage to auto merge config files it upgrades that i didn't touch.  (most people are going to  touch in some way the http.conf).  i think the cvs idea is very slick, better than md5's.  i'd hate to have CVS folders all over my etc tree though.  i wonder if they could be .cvs folders?  

anyway cvs, or md5, portage shouldn't bother me with files i didn't touch. it's a pain to update after an upgrade. and very error prone. i have to remember if i changed that file ages ago when i installed the software or used it along the way.
Comment 10 Jason Stubbs (RETIRED) gentoo-dev 2005-07-28 07:25:29 UTC
Putting a hold on feature requests for portage as they are drowning out the 
bugs. Most of these features should be available in the next major version of 
portage. But for the time being, they are just drowning out the major bugs and 
delaying the next version's progress. 
 
Any bugs that contain patches and any bugs for etc-update or dispatch-conf can 
be reopened. Sorry, I'm just not good enough with bugzilla. ;) 
Comment 11 Jakub Moc (RETIRED) gentoo-dev 2005-08-06 02:45:04 UTC
*** Bug 101520 has been marked as a duplicate of this bug. ***
Comment 12 Jakub Moc (RETIRED) gentoo-dev 2006-01-04 13:13:32 UTC
*** Bug 117780 has been marked as a duplicate of this bug. ***