Re: ucf: Diversion of /u/b/ucf by etcgit

2009-04-22 Thread Manoj Srivastava
On Wed, Apr 22 2009, Jörg Sommer wrote: > I've changed the wrapper of ucf to do nothing and pass full control > over to ucf until enable_ucf_wrapper is set to yes in > /etc/etcgit.conf. This isn't set by default, so after installation of > the package the user has to enable the wrapper manually.

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-04-22 Thread Jörg Sommer
Hi Manoj, Manoj Srivastava wrote: > On Sun, Feb 22 2009, Jörg Sommer wrote: > >> Manoj Srivastava wrote: >>> On Sun, Feb 22 2009, Jörg Sommer wrote: Manoj Srivastava wrote: > On Sat, Feb 21 2009, Jörg Sommer wrote: >> >> Right, but when I hook into apt-get, I can get the config

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-24 Thread Manoj Srivastava
On Mon, Feb 23 2009, sean finney wrote: > On Mon, Feb 23, 2009 at 09:24:17PM +0100, Frank Küster wrote: >> > (1) I use the >> > hooks provided by apt to get the original files from the >> > package >> >> In other words, with ucf you get NOTHING, since there are no original >> files in the package

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-23 Thread sean finney
On Mon, Feb 23, 2009 at 09:24:17PM +0100, Frank Küster wrote: > > (1) I use the > > hooks provided by apt to get the original files from the > > package > > In other words, with ucf you get NOTHING, since there are no original > files in the package. They are only created temporarily while postins

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-23 Thread Frank Küster
Jörg Sommer wrote: >>> But I can get the files dpkg installs in /etc. That's enough for the >>> first step. I don't want to create an AI that does everything right. One >>> step after the other! >> >> No, dpkg installs _nothing_ in /etc for ucf related files > > Right, but your are mixing

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-22 Thread Manoj Srivastava
On Sun, Feb 22 2009, Jörg Sommer wrote: > Manoj Srivastava wrote: >> On Sun, Feb 22 2009, Jörg Sommer wrote: >>> Manoj Srivastava wrote: On Sat, Feb 21 2009, Jörg Sommer wrote: > > Right, but when I hook into apt-get, I can get the configuration file > shipped with the packages.

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-22 Thread Jörg Sommer
Manoj Srivastava wrote: > On Sun, Feb 22 2009, Jörg Sommer wrote: >> Frank Küster wrote: >>> Jörg Sommer wrote: >>> Right, but when I hook into apt-get, I can get the configuration file shipped with the packages. >>> >>> You cannot, since the very purpose of ucf is to give dpkg-conffi

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-22 Thread Jörg Sommer
Manoj Srivastava wrote: > On Sun, Feb 22 2009, Jörg Sommer wrote: >> Manoj Srivastava wrote: >>> On Sat, Feb 21 2009, Jörg Sommer wrote: Right, but when I hook into apt-get, I can get the configuration file shipped with the packages. But that has nothing to do with ucf. >>> >>>

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-22 Thread Manoj Srivastava
On Sun, Feb 22 2009, Jörg Sommer wrote: > Manoj Srivastava wrote: >> On Sat, Feb 21 2009, Jörg Sommer wrote: >>> >>> Right, but when I hook into apt-get, I can get the configuration file >>> shipped with the packages. But that has nothing to do with ucf. >> >> What does "hook into apt-get

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-22 Thread Manoj Srivastava
On Sun, Feb 22 2009, Jörg Sommer wrote: > Hi Frank, > > Frank Küster wrote: >> Jörg Sommer wrote: >> >>> Right, but when I hook into apt-get, I can get the configuration file >>> shipped with the packages. >> >> You cannot, since the very purpose of ucf is to give dpkg-conffile-like >> behavior

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-22 Thread Jörg Sommer
Hi Frank, Frank Küster wrote: > Jörg Sommer wrote: > >> Right, but when I hook into apt-get, I can get the configuration file >> shipped with the packages. > > You cannot, since the very purpose of ucf is to give dpkg-conffile-like > behavior for configuration files *not* shipped in the package

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-22 Thread Jörg Sommer
Manoj Srivastava wrote: > On Sat, Feb 21 2009, Jörg Sommer wrote: >> >> Right, but when I hook into apt-get, I can get the configuration file >> shipped with the packages. But that has nothing to do with ucf. > > What does "hook into apt-get" mean? I use the hooks Pre-Install-Pkgs and Pos

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-22 Thread Jörg Sommer
Hi Steve, Steve Langasek wrote: > On Sat, Feb 21, 2009 at 11:09:52PM +, Jörg Sommer wrote: >> save_original >> merge_with_current >> export UCF_FORCE_CONFFOLD=1 >> ucf.etcgit "$@" > > So this will leave the ucf db with a horribly incorrect view Which bit in ucf's database would become invali

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-22 Thread Manoj Srivastava
On Sun, Feb 22 2009, Vincent Danjean wrote: > Manoj Srivastava wrote: >> I think the correct thing for the wrapper to do is >> a) change branch to the upstram_version_branch, and commit the new >> upstream. >> b) Change back to the local branch >> c) run ucf and let the user do the

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-22 Thread Frank Küster
Jörg Sommer wrote: > Right, but when I hook into apt-get, I can get the configuration file > shipped with the packages. You cannot, since the very purpose of ucf is to give dpkg-conffile-like behavior for configuration files *not* shipped in the package. Regards, Frank -- Frank Küster Debian

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-22 Thread Vincent Danjean
Manoj Srivastava wrote: > I think the correct thing for the wrapper to do is > a) change branch to the upstram_version_branch, and commit the new > upstream. > b) Change back to the local branch > c) run ucf and let the user do their thing (replace, not replace, edit, > whatever

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-21 Thread Manoj Srivastava
On Sat, Feb 21 2009, Jörg Sommer wrote: > Manoj Srivastava wrote: >> On Sat, Feb 21 2009, Jörg Sommer wrote: >>> Manoj Srivastava hat am Fri 20. Feb, 12:04 (-0600) geschrieben: On Fri, Feb 20 2009, Jörg Sommer wrote: > I'm packaging etcgit [1], a system to manage configuration fil

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-21 Thread Manoj Srivastava
On Sat, Feb 21 2009, Frank Küster wrote: > Manoj Srivastava wrote: > >>> Yes, ucf should not touch the configuration file, because the merge >>> was done by etcgit. When ucf sees the “old” configuration file it's >>> already updated by etcgit. The ucf call is only to let ucf update it's >>> inter

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-21 Thread Steve Langasek
On Sat, Feb 21, 2009 at 11:09:52PM +, Jörg Sommer wrote: > >> the configuration files modified by the administrator are stored. The > >> former branch is updated when ucf or apt-get is run. Then these > > How is the former branch updated with the new version, since you > > are using

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-21 Thread Jörg Sommer
Manoj Srivastava wrote: > On Sat, Feb 21 2009, Jörg Sommer wrote: >> Manoj Srivastava hat am Fri 20. Feb, 12:04 (-0600) geschrieben: >>> On Fri, Feb 20 2009, Jörg Sommer wrote: >>> >>> > I'm packaging etcgit [1], a system to manage configuration files in /etc >>> > with git, similar to etckeeper.

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-21 Thread Frank Küster
Manoj Srivastava wrote: >> Yes, ucf should not touch the configuration file, because the merge >> was done by etcgit. When ucf sees the “old” configuration file it's >> already updated by etcgit. The ucf call is only to let ucf update it's >> internal database. > > ucf only changes the co

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-21 Thread Manoj Srivastava
On Sat, Feb 21 2009, Jörg Sommer wrote: > Hi Manoj, Hi debian-devel, > > Manoj Srivastava hat am Fri 20. Feb, 12:04 (-0600) geschrieben: >> On Fri, Feb 20 2009, Jörg Sommer wrote: >> >> > I'm packaging etcgit [1], a system to manage configuration files in /etc >> > with git, similar to etckeeper.

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-21 Thread Jörg Sommer
Hi Manoj, Hi debian-devel, Manoj Srivastava hat am Fri 20. Feb, 12:04 (-0600) geschrieben: > On Fri, Feb 20 2009, Jörg Sommer wrote: > > > I'm packaging etcgit [1], a system to manage configuration files in /etc > > with git, similar to etckeeper. Etcgit tracks the original version of all > > fil

Re: ucf: Diversion of /u/b/ucf by etcgit

2009-02-20 Thread Manoj Srivastava
On Fri, Feb 20 2009, Jörg Sommer wrote: > I'm packaging etcgit [1], a system to manage configuration files in /etc > with git, similar to etckeeper. Etcgit tracks the original version of all > files and therefore, I have to wrap ucf to get the original version and > stop ucf from doing anything. T