app-portage/cfg-update - installation instructions

Message

xentric · Post by **xentric** » Mon Sep 26, 2005 5:46 am

wolfbite_aus wrote:so if I
cfg-update --fix
source /etc/profile
cfg-update --index
that SHOULD get it working as above?
(thought I did all that, because its sortof working)

1.7.2 is the latest. Cfg-update 1.8.0 is not in portage yet, I'm testing it but it's not yet ready for release.
Just follow the installation instructions to make it work like it's supposed to

It shouldn't matter if the new ._cfg0000_file has changed slightly compared to the original config file. Only if you have changed the original config file, after it was installed, cfg-update should force you to update manually. If you haven't put settings in a file, it should auto-update...

blank_vlad · Post by **blank_vlad** » Thu Dec 22, 2005 10:10 pm

xentric wrote:Cfg-update 1.8.0 is not in portage yet, I'm testing it but it's not yet ready for release.

What's the status on 1.8.0? Do you need help testing?

xentric · Post by **xentric** » Fri Dec 23, 2005 9:03 pm

I'm trying really hard to get 1.8.0 ready before the end of this year...
I didn't have to work (vacation) this week for the first time since february and I wanted to implement automatic 3-way merging with merge-conflict detection. The code got a bit messy so I decided to completely rewrite the update routine and split the updating process up in 5 different stages. These stages can be independently enabled/disabed to suit your needs. As soon as it's ready for testing I will post it here so you can test it!

Some new features:

Code: Select all

- Updating in stages:
     stage1 -  Automatic overwriting           (unmodified files, unmodified binaries)
     stage2 -  Automatic 3-way merging         (modified files, custom files)
     stage3 -  Manual 3-file merging           (modified files, custom files)
     stage4 -  Manual 2-file merging           (modified files, custom files)
     stage5 -  Manual replacing of other files (modified binaries, custom binaries, link-to-file, file-to-link, link-to-link)
- Fixed unnecessary checksum-index updates.
- Uses a configuration file for settings (/etc/cfg-update.conf)
- Added new options:
     -a, --automatic
                   Only does automatic updates and skips stage 3,4,5 (for use with cronjob)
     -p, --pretend
                   Pretend update
     -t, --tool
                   Set a merge tool on the commandline (overrides default setting in /etc/cfg-update.conf)

travlr · Post by **travlr** » Sun Dec 25, 2005 10:23 pm

xentric wrote:I'm trying really hard to get 1.8.0 ready before the end of this year...

xentric,
Just wanted to throw out a big thanks :^)
cfg-update is a huge help and we very much appreciate your contributions...

travlr

Devport · Post by **Devport** » Mon Dec 26, 2005 11:11 am

IMHO cfg-update really should become the gentoo default. I use it for a year now and it works like a charm. Why maintain old dumb etc-update when there is cfg-update which is much more useful on X / GNOME / KDE based systems and still as good on console only systems...

blank_vlad · Post by **blank_vlad** » Mon Jan 02, 2006 1:15 pm

Excellent, the new cfg-update ebuild is in bugzilla and ready for testing: http://forums.gentoo.org/viewtopic-t-86622.html

While waiting for the new version, I rigged dispatch-conf to use Meld just to see if it would work, and it does. All I had to do was edit /etc/dispatch-conf.conf, comment out two existing lines and replace them:

Code: Select all

#diff="colordiff -Nu %s %s | less --no-init --QUIT-AT-EOF"
diff="meld %s %s"

#merge="sdiff --suppress-common-lines --output=%s %s %s"
merge="echo %s > /dev/null && meld %s %s"

That last line is kind of a kludge because Meld will only take 2 parameters on the command line for a 2-way comparison and dispatch-conf wants to send it 3 parameters, so instead of modifying dispatch-conf's code I just made the shell chomp the extra parameter with some ugly command line fu.

Now what I'm wondering is, other than user interface improvements, what advantages do we get with cfg-update's handling of config files over dispatch-conf's?

xentric · Post by **xentric** » Mon Jan 02, 2006 8:01 pm

blank_vlad wrote:Now what I'm wondering is, other than user interface improvements, what advantages do we get with cfg-update's handling of config files over dispatch-conf's?

Dispatch-conf and cfgupdate both do the same autoupdating of unmodified files.

Dispatch-conf can autoupdate CVS and cruft changes, cfg-update does fully automatic
3-way merges if it's possible. It needs the backup of the previous ._cfg0000_ file for this
so it means that the longer you use cfg-update, the better it get's.
I will check if I can get these original files from the tarball of the package for all modified
files, so we can always let cfg-update try an automatic 3-way merge on modified files.

With cfg-update you can easily change between xxdiff, kdiff3, meld, tkdiff, kompare, gtkdiff
and sdiff. They all have been configured and tested and the script gives you info on how to
save the merged result when you are done, depending on the tool you are using.

You can use cfg-update with automated system maintenace scripts and cronjobs
because the -a option only does the automatic updates and skips all manual updates...

But dispatch-conf is good too, so just use whatever you like best!

ping-uino · Post by **ping-uino** » Wed Jan 25, 2006 8:48 pm

I tried your cfg-update program on my sparc...
And everythings seems work well...
Then, why not include sparc as testing architecture?

I'm using the "old" 1.7.1 and i emerged few packages, but the difference between etc-update is evident!
Very good work, congratulation!

xentric · Post by **xentric** » Wed Jan 25, 2006 9:25 pm

ping-uino wrote:I tried your cfg-update program on my sparc...
And everythings seems work well...
Then, why not include sparc as testing architecture?
I'm using the "old" 1.7.1 and i emerged few packages, but the difference between etc-update is evident!
Very good work, congratulation!

Thanks for your feedback

If 1.7.1 works on sparc, then 1.8.0 should also work on sparc!
I'll ask the package maintainer to include ~sparc.

ping-uino · Post by **ping-uino** » Thu Jan 26, 2006 10:19 am

I'll ask the package maintainer to include ~sparc.

It would be great!
And i'm impatience to see this tool instead etc-update!
(and trying it on every architecture is one step)

I upgraded to the last 1.8.0-r3 version, emerged without problem...
Then i'm updating many packages for testing, but at this moment i haven't any problem...

I'd like to see a simple website page for cfg-update, forum is not very functional to search packages

Okay, the last complain (i promised!)

for the "manual" in my (humble) opinion:

> Enable the alias for emerge in /root/.bash_profile:

I'd write something like: "enable cfg-update on your system"
The first time i read it (i'm not english, i know my english is poor...) i believed to add manaully an alias to my .bashrc!

> Log out and use sux to become root again

I'm console purist... Can you put this step optional?!

And why not put in some part a very little guide about common commands?
Something like:
To list update: cfg-update -xyz

Bye!

xentric · Post by **xentric** » Thu Jan 26, 2006 10:18 pm

ping-uino wrote:And i'm impatience to see this tool instead etc-update!

Well, I think that cfg-update will never become the default tool because it's written in perl. If I had written it in python or bash it would have had a much better chance of becoming the default tool.

(and trying it on every architecture is one step)

I've found someone willing to test cfg-update on a Mac too. So I'll wait for the results and hopefully I can email the package maintainer soon to have him add ~ppc and ~sparc as supported systems

I'd like to see a simple website page for cfg-update, forum is not very functional to search packages

Right now I have redirected the url which is mentioned in the ebuild, manpage and on packages.gentoo.org to this forum post. I can make a simple page and remove the redirection... but to be honest, this has a very low priority on my tasklist.

Okay, the last complain (i promised!)

I don't see this as complaints but as constructive criticism. Your suggestions, tips, ideas, dislikes and complaints are all equally welcome!

for the "manual" in my (humble) opinion:
> Enable the alias for emerge in /root/.bash_profile:
I'd write something like: "enable cfg-update on your system"
The first time i read it (i'm not english, i know my english is poor...) i believed to add manaully an alias to my .bashrc!

Good point... I will update the instructions.

> Log out and use sux to become root again
I'm console purist... Can you put this step optional?

I can, and it is actually optional... but because the root account on Gentoo systems is configured very restricted by default, and most people use an Xserver, I think this is a sane instruction for most installs. But I will add a note for CLI-only freaks

I'll change the 1.8.0-r4 ebuild so that sux is not a dependency when USE="-kde -gnome"!

And why not put in some part a very little guide about common commands?
Something like:
To list update: cfg-update -xyz

I figured that the manpage is a good place to put this in. Just type "man cfg-update" and scroll down to the EXAMPLES section to see some basic usage examples.

Rick · Post by **Rick** » Thu Apr 06, 2006 6:55 pm

Just wondering, would it be possible to use colordiff/vimdiff instead of sdiff, the tiny b/w sdiff window isn't very pleasant to look at. And as you can understand I don't have X running on my servers

xentric · Post by **xentric** » Fri Apr 07, 2006 10:31 pm

Rick wrote:Just wondering, would it be possible to use colordiff/vimdiff instead of sdiff, the tiny b/w sdiff window isn't very pleasant to look at.

I'm not familiar with vimdiff, but you can try "cfg-update -u -t vimdiff" or "cfg-update -u -t /TYPE_PATH_HERE/vimdiff". If that works, you can change the default tool setting in /etc/cfg-update.conf

Rick · Post by **Rick** » Sat Apr 08, 2006 2:23 pm

Well, that's what I've tried but it won't cooperate :X

Code: Select all

# cfg-update -mu -t /usr/bin/colordiff
<< Stage1 >> disabled with -m or --manual flag, skipping...
<< Stage2 >> disabled with -m or --manual flag, skipping...

* GUI not available, unable to run the mergetool set in /etc/cfg-update.conf
* you can only use a cmdline tool like "sdiff" for interactive/manual merging!
* Run cfg-update from within an X-terminal to use the GUI tool for merging
* or if you use this script on a system without an X-server you can change the
* MERGETOOL to /usr/bin/sdiff in /etc/cfg-update.conf or by using the -t option
* like: "cfg-update -u -t /usr/bin/sdiff"

Here's my current config (without the comments)

Code: Select all

MERGETOOL = /usr/bin/sdiff
ENABLE_BACKUPS = yes
ENABLE_STAGE1 = yes
ENABLE_STAGE2 = yes
ENABLE_STAGE3 = no
ENABLE_STAGE4 = yes
ENABLE_STAGE5 = yes

Edit after looking at the code I found the problem, fixed it by removing the $mergetool check since it's kind of silly to force a few specific tools if a gui isn't available

xentric · Post by **xentric** » Sat Apr 08, 2006 4:20 pm

Rick wrote:Edit after looking at the code I found the problem, fixed it by removing the $mergetool check since it's kind of silly to force a few specific tools if a gui isn't available

I'll test and fix that mergetool check in the next version. Thanks for telling me this!

Rick · Post by **Rick** » Sat Apr 08, 2006 4:24 pm

A good fix would probably be to give a warning if the user tries xxdiff/kdiff3/meld at the console, right now I've just removed the entire check but that will be confusing for people that don't have the settings right.

Kasumi_Ninja · Post by **Kasumi_Ninja** » Mon Jul 03, 2006 1:53 pm

Wow nice tool. Might be just what I am looking for! Emerging it now

Edit: it works just fine. Though I would like some additional information about using xxdiff. If I get that screen in front of mee I don't have a clue about what to do next. Now I check the diffrences between the left and the rightpane. and decide whicgh which one l like ro keep.

Kasumi_Ninja · Post by **Kasumi_Ninja** » Sun Jul 16, 2006 8:36 am

Another problem I encountered is the 'high requirements' of cfg-update. When trying to install on a newly installed system with fluxbox running I get this longs list:

Code: Select all

emerge -av cfg-update

These are the packages that would be merged, in order:

Calculating dependencies... done!
[ebuild  N    ] app-text/aspell-0.50.5-r4  USE="gpm" 992 kB 
[ebuild  N    ] media-libs/libmad-0.15.1b  USE="-debug" 490 kB 
[ebuild  N    ] media-libs/lcms-1.14-r1  USE="jpeg python tiff zlib" 653 kB 
[ebuild  N    ] media-libs/libmng-1.0.8-r1  497 kB 
[ebuild  N    ] app-text/poppler-0.5.3  USE="jpeg" 1,025 kB 
[ebuild  N    ] net-print/cups-1.1.23-r8  USE="nls pam ssl -gnutls -samba -slp" 
8,501 kB 
[ebuild  N    ] x11-libs/qt-3.3.6-r1  USE="cups gif ipv6 opengl xinerama -debug 
-doc -examples -firebird -immqt -immqt-bc -mysql -nas -nis -odbc -postgres -sqli
te" 14,224 kB 
[ebuild  NS   ] dev-libs/glib-2.10.3  USE="-debug -doc -hardened" 2,708 kB 
[ebuild  N    ] media-libs/libogg-1.1.2  410 kB 
[ebuild  N    ] kde-base/kde-env-3-r4  0 kB 
[ebuild  N    ] media-libs/libvorbis-1.1.0  USE="-aotuv" 1,281 kB 
[ebuild  N    ] media-libs/audiofile-0.2.6-r1  365 kB 
[ebuild  N    ] media-sound/esound-0.2.36-r1  USE="alsa ipv6 tcpd -debug -static
" 361 kB 
[ebuild  N    ] kde-base/arts-3.5.2-r1  USE="alsa esd mp3 vorbis xinerama -artsw
rappersuid -debug -jack -kdeenablefinal -kdehiddenvisibility -nas" 944 kB 
[ebuild  N    ] dev-libs/libxml2-2.6.26  USE="ipv6 python readline -debug -doc -
test" 3,338 kB 
[ebuild  N    ] dev-libs/libgpg-error-1.0-r1  USE="nls" 316 kB 
[ebuild  N    ] dev-libs/libgcrypt-1.2.2-r1  USE="nls" 939 kB 
[ebuild  N    ] dev-libs/libxslt-1.1.17  USE="crypt python -debug" 1,865 kB 
[ebuild  N    ] dev-libs/libpcre-6.3  USE="-doc" 552 kB 
[ebuild  N    ] net-dns/libidn-0.5.15  USE="java nls -doc -emacs" 1,925 kB 
[ebuild  N    ] media-libs/libart_lgpl-2.3.17  USE="-debug" 282 kB 
[ebuild  N    ] x11-libs/cairo-1.0.4  USE="X png -doc -glitz" 1,441 kB 
[ebuild  N    ] x11-libs/pango-1.12.3  USE="-debug -doc" 1,197 kB 
[ebuild  N    ] dev-libs/atk-1.11.4  USE="-debug -doc" 606 kB 
[ebuild  N    ] x11-misc/shared-mime-info-0.16  735 kB 
[ebuild  NS   ] x11-libs/gtk+-2.8.19  USE="X jpeg tiff xinerama -debug -doc" 12,
015 kB 
[ebuild  N    ] media-fonts/gnu-gs-fonts-std-8.11  3,664 kB 
[ebuild  N    ] app-text/ghostscript-gpl-8.54  USE="X cups gtk -cjk -emacs -jpeg
2k" 12,082 kB 
[ebuild  N    ] virtual/ghostscript-0  0 kB 
[ebuild  N    ] app-dicts/aspell-en-0.51.1  168 kB 
[ebuild  N    ] app-admin/gamin-0.1.7  USE="-debug -doc" 529 kB 
[ebuild  N    ] kde-base/kdelibs-3.5.2-r6  USE="alsa arts cups spell ssl tiff xi
nerama -acl -debug -doc -jpeg2k -kdeenablefinal -kdehiddenvisibility -kerberos -
legacyssl -openexr -zeroconf" 15,101 kB 
[ebuild  N    ] dev-util/tmake-1.8-r1  46 kB 
[ebuild  N    ] dev-util/xxdiff-3.0.2-r1  USE="kde" 1,039 kB 
[ebuild  N    ] dev-libs/libIDL-0.8.6  USE="-debug -static" 342 kB 
[ebuild  N    ] gnome-base/orbit-2.14.0  USE="ssl -debug -doc -static" 687 kB 
[ebuild  N    ] dev-python/pyorbit-2.14.0  USE="-debug" 269 kB 
[ebuild  N    ] gnome-base/libglade-2.5.1  USE="-debug -doc" 310 kB 
[ebuild  N    ] gnome-base/libbonobo-2.14.0  USE="-debug -doc" 1,354 kB 
[ebuild  N    ] gnome-base/gnome-mime-data-2.4.2  USE="-debug" 829 kB 
[ebuild  N    ] net-misc/neon-0.25.3  USE="ssl zlib -expat" 713 kB 
[ebuild  N    ] gnome-base/gconf-2.14.0  USE="-debug -doc" 1,851 kB 
[ebuild  N    ] sys-fs/device-mapper-1.02.07  902 kB 
[ebuild  N    ] sys-fs/cryptsetup-luks-1.0.3-r2  USE="nls -dynamic -pic" 297 kB 
[ebuild  N    ] dev-lang/swig-1.3.25  USE="java perl python -doc -guile -php -ru
by -tcl -tk" 3,370 kB 
[ebuild  N    ] sys-libs/libcap-1.10-r5  USE="python -nocxx -static" 38 kB 
[ebuild  N    ] dev-libs/libusb-0.1.10a  USE="-debug -doc" 366 kB 
[ebuild  N    ] dev-python/pyrex-0.9.3-r2  171 kB 
[ebuild  N    ] sys-apps/dbus-0.61-r1  USE="X gtk python qt3 -debug -doc -mono" 
1,695 kB 
[ebuild  N    ] gnome-base/gnome-vfs-2.14.2  USE="hal ipv6 ssl -avahi -debug -do
c -gnutls -samba" 1,773 kB 
[ebuild  N    ] gnome-base/libgnome-2.14.1  USE="esd -debug -doc -static" 971 kB
 
[ebuild  N    ] gnome-base/libgnomecanvas-2.14.0  USE="X -debug -doc -static" 59
7 kB 
[ebuild  N    ] gnome-base/libbonoboui-2.14.0  USE="X -debug -doc" 872 kB 
[ebuild  N    ] gnome-base/gnome-keyring-0.4.9  USE="-debug" 386 kB 
[ebuild  N    ] gnome-base/libgnomeui-2.14.1  USE="jpeg -debug -doc" 1,847 kB 
[ebuild  N    ] x11-themes/hicolor-icon-theme-0.8  30 kB 
[ebuild  N    ] dev-perl/XML-NamespaceSupport-1.09  USE="perl -minimal" 7 kB 
[ebuild  N    ] dev-perl/XML-SAX-0.13  USE="perl -minimal" 57 kB 
[ebuild  N    ] virtual/perl-Storable-2.15  0 kB 
[ebuild  N    ] dev-perl/XML-Simple-2.14  USE="perl -minimal" 64 kB 
[ebuild  N    ] x11-misc/icon-naming-utils-0.7.0  59 kB 
[ebuild  N    ] x11-themes/gnome-icon-theme-2.14.2  USE="-debug" 2,878 kB 
[ebuild  N    ] net-print/libgnomecups-0.2.0  USE="-debug" 303 kB 
[ebuild  N    ] gnome-base/libgnomeprint-2.12.1  USE="cups -debug -doc" 769 kB 
[ebuild  N    ] gnome-base/libgnomeprintui-2.12.1  USE="-debug -doc" 631 kB 
[ebuild  N    ] dev-python/pyopengl-2.0.0.44  1,251 kB 
[ebuild  N    ] dev-python/pycairo-1.0.2  USE="gtk -numeric -svg" 458 kB 
[ebuild  N    ] dev-python/numeric-23.7  708 kB 
[ebuild  N    ] x11-libs/gtkglarea-1.99.0  USE="-debug" 205 kB 
[ebuild  N    ] dev-python/pygtk-2.8.6  USE="opengl -doc" 739 kB 
[ebuild  N    ] dev-python/gnome-python-2.12.4  USE="-debug -doc -gtkhtml" 368 k
B 
[ebuild  N    ] app-text/sgml-common-0.6.3-r4  74 kB 
[ebuild  N    ] app-text/build-docbook-catalog-1.2  3 kB 
[ebuild  N    ] app-text/docbook-xsl-stylesheets-1.68.1-r1  944 kB 
[ebuild  N    ] app-arch/unzip-5.52  1,113 kB 
[ebuild  N    ] app-text/docbook-xml-dtd-4.1.2-r6  73 kB 
[ebuild  N    ] app-text/scrollkeeper-0.3.14-r2  USE="nls" 663 kB 
[ebuild  N    ] gnome-extra/libgda-1.2.2-r1  USE="berkdb -debug -doc -firebird -
freetds -ldap -mdb -mysql -oci8 -odbc -postgres -sqlite -xbase" 1,212 kB 
[ebuild  N    ] x11-apps/xdpyinfo-1.0.1  USE="-debug" 85 kB 
[ebuild  N    ] www-client/mozilla-launcher-1.49  5 kB 
[ebuild  N    ] dev-libs/nspr-4.6.1-r2  USE="ipv6" 1,301 kB 
[ebuild  N    ] app-arch/zip-2.31  USE="crypt" 783 kB 
[ebuild  N    ] dev-libs/nss-3.11-r1  4,885 kB 
[ebuild  N    ] www-client/mozilla-firefox-1.5.0.4  USE="gnome ipv6 java xineram
a -debug -mozdevelop -xprint" LINGUAS="-ar -ca -cs -da -de -el -en_GB -es -es_AR
 -es_ES -fi -fr -ga -ga_IE -he -hu -it -ja -ko -mk -nb -nb_NO -nl -pl -pt_BR -ro
 -ru -sk -sl -sv -sv_SE -tr -zh_CN -zh_TW" 34,550 kB 
[ebuild  N    ] gnome-extra/gtkhtml-2.6.3  USE="-accessibility -debug" 382 kB 
[ebuild  N    ] app-text/enchant-1.2.5  519 kB 
[ebuild  N    ] app-text/gtkspell-2.0.11-r1  USE="-doc" 339 kB 
[ebuild  N    ] dev-python/gnome-python-extras-2.14.0-r1  USE="X firefox -debug 
-doc -seamonkey" 339 kB 
[ebuild  N    ] dev-util/meld-1.1.3  USE="-debug -doc" 583 kB 
[ebuild  N    ] app-text/rman-3.2  77 kB 
[ebuild  N    ] x11-themes/gentoo-xcursors-0.3.1  1,168 kB 
[ebuild  N    ] x11-apps/xdriinfo-1.0.1  USE="-debug" 79 kB 
[ebuild  N    ] x11-misc/xorg-cf-files-1.0.2  USE="-debug" 258 kB 
[ebuild  N    ] x11-misc/imake-1.0.2  USE="-debug" 110 kB 
[ebuild  N    ] x11-libs/libXvMC-1.0.2  USE="-debug" 224 kB 
[ebuild  N    ] x11-libs/libXprintUtil-1.0.1  USE="-debug" 218 kB 
[ebuild  N    ] x11-libs/libXprintAppUtil-1.0.1  USE="-debug" 203 kB 
[ebuild  N    ] x11-apps/xsetroot-1.0.1  USE="-debug" 75 kB 
[ebuild  N    ] x11-apps/xcursorgen-1.0.1  USE="-debug" 80 kB 
[ebuild  N    ] x11-themes/xcursor-themes-1.0.1  USE="-debug" 2,204 kB 
[ebuild  N    ] x11-libs/libXevie-1.0.1  USE="-debug" 219 kB 
[ebuild  N    ] x11-libs/libXTrap-1.0.0  USE="-debug" 214 kB 
[ebuild  N    ] x11-apps/sessreg-1.0.0  USE="-debug" 80 kB 
[ebuild  N    ] x11-apps/xdm-1.0.5  USE="ipv6 pam -debug -xprint" 355 kB 
[ebuild  N    ] x11-libs/libFS-1.0.0  USE="ipv6 -debug" 231 kB 
[ebuild  N    ] x11-libs/liboldX-1.0.1  USE="-debug" 210 kB 
[ebuild  N    ] x11-misc/gccmakedep-1.0.2  USE="-debug" 68 kB 
[ebuild  N    ] virtual/x11-7.0-r2  USE="dri" 0 kB 
[ebuild  N    ] x11-misc/sux-1.0-r2  9 kB 
[ebuild  N    ] app-portage/cfg-update-1.8.0-r3  USE="gnome kde" 32 kB 

Total size of downloads: 174,466 kB

Would you like to merge these packages? [Yes/No]

Maedhros · Post by **Maedhros** » Sun Jul 16, 2006 9:20 am

That's due to the gnome and kde USE flags, I would have thought. You can see more clearly what depends on what by using the --tree option with emerge.

xentric · Post by **xentric** » Sun Jul 16, 2006 11:14 am

HXC wrote:Though I would like some additional information about using xxdiff. If I get that screen in front of mee I don't have a clue about what to do next. Now I check the diffrences between the left and the rightpane. and decide whicgh which one l like to keep.

Just read the first post of this thread, the section "Screenshots and usage" explains that you simply click on the yellow and green colored lines in xxdiff to select which ones should be put in the merged result... Pink will be included, blue will be discarded. After clicking all colored areas you can save the result with the "M"-button and cfg-update will replace the old config file with the merged result. The manpage ($ man cfg-update) also contains some usage instructions.

Another problem I encountered is the 'high requirements' of cfg-update. When trying to install on a newly installed system with fluxbox running I get this longs list:

Maedhros is right, if you specify -kde and -gnome USE-flags during installation, cfg-update won't need all those dependencies but the result is that you won't be able to use xxdiff or meld for updating. If you use -kde -gnome during installation cfg-update will default to sdiff for merging the config files with the ._cfg0000_ files. (sdiff is the commandline diff/merge tool which is also used by etc-update for interactive merging)
It's all explained in the first post of this thread...

chovy · Post by **chovy** » Thu Aug 24, 2006 5:23 pm

emerge -avt cfg-update

make -C po
make[1]: Entering directory `/var/tmp/portage/meld-1.1.3/work/meld-1.1.3/po'
mkdir -m 755 -p bg/LC_MESSAGES/ && msgfmt -c -o bg/LC_MESSAGES/meld.mo bg.po
mkdir -m 755 -p ca/LC_MESSAGES/ && msgfmt -c -o ca/LC_MESSAGES/meld.mo ca.po
mkdir -m 755 -p cs/LC_MESSAGES/ && msgfmt -c -o cs/LC_MESSAGES/meld.mo cs.po
mkdir -m 755 -p de/LC_MESSAGES/ && msgfmt -c -o de/LC_MESSAGES/meld.mo de.po
mkdir -m 755 -p en_CA/LC_MESSAGES/ && msgfmt -c -o en_CA/LC_MESSAGES/meld.mo en_CA.po
mkdir -m 755 -p en_GB/LC_MESSAGES/ && msgfmt -c -o en_GB/LC_MESSAGES/meld.mo en_GB.po
mkdir -m 755 -p es/LC_MESSAGES/ && msgfmt -c -o es/LC_MESSAGES/meld.mo es.po
mkdir -m 755 -p fi/LC_MESSAGES/ && msgfmt -c -o fi/LC_MESSAGES/meld.mo fi.po
mkdir -m 755 -p fr/LC_MESSAGES/ && msgfmt -c -o fr/LC_MESSAGES/meld.mo fr.po
mkdir -m 755 -p hu/LC_MESSAGES/ && msgfmt -c -o hu/LC_MESSAGES/meld.mo hu.po
mkdir -m 755 -p it/LC_MESSAGES/ && msgfmt -c -o it/LC_MESSAGES/meld.mo it.po
hu.po:8: nplurals = 1...
hu.po:101: ...but some messages have 2 plural forms
msgfmt: found 1 fatal error
make[1]: *** [hu/LC_MESSAGES/meld.mo] Error 1
make[1]: *** Waiting for unfinished jobs....
make[1]: Leaving directory `/var/tmp/portage/meld-1.1.3/work/meld-1.1.3/po'
make: *** [all] Error 2

!!! ERROR: dev-util/meld-1.1.3 failed.
Call stack:
ebuild.sh, line 1543: Called dyn_compile
ebuild.sh, line 938: Called src_compile
meld-1.1.3.ebuild, line 48: Called die

!!! make failed
!!! If you need support, post the topmost build error, and the call stack if relevant.

Can't emerge meld?

xentric · Post by **xentric** » Thu Aug 24, 2006 5:54 pm

chovy wrote:Can't emerge meld?

I can't help you with the build error, can't find anything about it in the Forums or on Google.

But you can set the -gnome USE-flag so meld won't be compiled as a dependency...
Just do this before emerging cfg-update:

Code: Select all

echo app-portage/cfg-update -kde -gnome >> /etc/portage/package.use

After emerging cfg-update, you can separately emerge the tools you would like to try. That way you can use cfg-update with other mergetools like xxdiff, kdiff3, gtkdiff, gvimdiff, vimdiff, etc... until you find the problem that prevents you from successfully emerging meld.

Note: vimdiff and gvimdiff are not yet supported, but you only need to insert two lines of code into the cfg-update script to make them work. They will be supported by the next version which will probably hit the mirrors in about two weeks. See this post for the two lines of code and instructions on how to use (g)vimdiff with cfg-update.

devsk · Post by **devsk** » Mon Aug 28, 2006 5:18 am

I got this:

Code: Select all

$ emerge -pv gnome
Nested quantifiers in regex; marked by <-- HERE in m/app-benchmarks:bonnie++ <-- HERE -1.93c:20060828-032906.log/ at /usr/bin/cfg-update line 759.

USAGE     cfg-update [flags] [runmode]                     (version 1.8.0-r3)

FLAGS
  -d, --debug
          Debugging, unhides STDERR messages and shows subroutine tags

  -a, --automatic-only
          Skips manual updates (for use with cronjobs)

  -m, --manual-only
          Skips automatic updates

  -t, --tool /path/tool
          Set tool, overrides the default tool setting in /etc/cfg-update.conf

  -p, --pretend
          Pretend, simulate the update session without changing anything

  -v, --verbose
          Verbose output, shows all file operations and unhides STDERR messages

RUNMODES
  -l, --list
          List updates (._cfg????_* files) including modification state

  -u, --update
          Update the protected configuration files

  -b, --backups
          List backup files, with numbers for use with the -r option

  -r, --restore [n]
          Restore a backup by using a number from the -b output

  -s, --show-protected-dirs
          Shows directories protected by the CONFIG_PROTECT system variable

  -i, --index
          Create or update the checksum-index

  --on
          Enable integration with the emerge command (alias in /root/.bashrc)

  --off
          Disable integration with the emerge command (alias in /root/.bashrc)

MERGETOOL
  xxdiff  (manual 3-way merging is supported)

INFORMATION
  Start (as root) with "cfg-update -l" to list all the ._cfg????_* files,
  followed by "cfg-update -u" to update the current config files one by one.
  You can also use the --pretend mode with "cfg-update -p -u" to see how
  cfg-update will handle the files and optionally add "-t diff" to take a
  quick look at the differences between the files...

  In xxdiff, select the lines you want to keep/add by clicking on them.
  Save the merged result by clicking on the "save as merged" [M] button.
  After closing xxdiff, cfg-update will replace the current config file with
  the .merge file you have just created. Backups are made automatically, so
  you can always restore the previous version of a config file if the new
  version causes any problems...

SETTINGS (from /etc/cfg-update.conf)
  << Stage1 >>  Automatic replacing     - enabled
  << Stage2 >>  Automatic 3-way merging - enabled
  << Stage3 >>  Manual 3-way merging    - enabled
  << Stage4 >>  Manual 2-way merging    - enabled
  << Stage5 >>  Manual replacing        - enabled

For more info, type: man cfg-update


These are the packages that would be merged, in order:

Calculating dependencies... done!
[ebuild   R   ] gnome-base/gnome-2.14.2  USE="cdr dvdr hal -accessibility" 0 kB

Total size of downloads: 0 kB

It seems like cfg-update doesn't like '++' in package names(as in bonnie++), it clashes with some regexp processing.

I am not sure if printing the man page on some internal error is a good idea.

xentric · Post by **xentric** » Mon Aug 28, 2006 9:30 am

devsk wrote:It seems like cfg-update doesn't like '++' in package names(as in bonnie++), it clashes with some regexp processing.

Thanks for reporting this!
I've been able to reproduce this on my machine. When the most recent .log file in /var/log/portage has "++" in the filename it chokes on it. I've fixed this in the new version (will be released soon) by stripping the "++" before any matching is done.

You can fix your issue by removing that portage log file:

Code: Select all

rm /var/log/portage/app-benchmarks:bonnie++-1.93c:20060828-032906.log

I am not sure if printing the man page on some internal error is a good idea.

This is not done intentionally, the script somehow manages to skip a section of code that would make it exit cleanly. It looks like perl kills the subroutine that produces this error upon matching, but aparently it also kills the parent subroutine that called the broken subroutine. So it skips the explicit "exit;" at the end of the parent subroutine and continues with the next subroutine which happends to be "print_usage"... Very weird behaviour!

chovy · Post by **chovy** » Mon Aug 28, 2006 9:53 am

put your man page at the bottom of your perl script after

Code: Select all

#!/usr/bin/perl -w

print "foo";

__END__

=pod

=head1 FOO()

=head1 Anthony Ettinger

This is a demo of documenting with __END__

=cut

It will stop interpreting perlcode at that point. saves execution time if you have a big documentation section.

Then you can view the documetnation with ~$ perldoc foo.pl