Re: [gentoo-user] n config files in /etc need updating
Output of colordiff is more readable ;) 2.) What do and mean ? Assuming you're doing # diff FILE-A FILE-B '' indicates the contents of FILE-A '' indicates the contents of FILE-B note: when running etc-update, the diff it shows you is FILE-A is the original (your version), FILE-B is the update (which you downloaded when you emerged). -- sergey -- [EMAIL PROTECTED] mailing list
Re: [gentoo-user] n config files in /etc need updating
That is better, thanks :) --- sergey [EMAIL PROTECTED] wrote: Output of colordiff is more readable ;) __ Do you Yahoo!? SBC Yahoo! DSL - Now only $29.95 per month! http://sbc.yahoo.com -- [EMAIL PROTECTED] mailing list
[gentoo-user] n config files in /etc need updating
Hi everyone, I update my cups, when it finished merging is said: *IMPORTANT 3 config files in /etc/ need updating. I did find /etc -iname '._cfg_*' and the output was this: /etc/cups/._cfg_printers.conf /etc/cups/._cfg_cupsd.conf /etc/._cfg_man.conf I got some help from reading the forum FAQs but not enough. Previously I had edited /etc/cups/cupsd.conf, now according to the tutorial, I can do etc-update, and replace all file IF I have NOT changed them before. I also found out that to find the difference between the new one and the old one I would do: diff cupsd.conf ._cfg_cupsd.conf I did that and the output was this: root# 56c56 ServerAdmin [EMAIL PROTECTED] --- #ServerAdmin [EMAIL PROTECTED] 166c166 LogLevel debug2 --- LogLevel info 477c477 BrowseAddress @IF(eth0) --- #BrowseAddress @IF(name) root# Now I have a few question: 1.) What does the number mean [at diff]? 2.) What do and mean ? 3.) What does the broken line mean ? 4.) How would I fix this cupsd.conf thing? Thank you, ZiM __ Do you Yahoo!? SBC Yahoo! DSL - Now only $29.95 per month! http://sbc.yahoo.com -- [EMAIL PROTECTED] mailing list
Re: [gentoo-user] n config files in /etc need updating
On Wed, Jun 25, 2003 at 04:14:37PM -0700, G?zim Hoxha wrote: [snip] I did that and the output was this: root# 56c56 ServerAdmin [EMAIL PROTECTED] --- #ServerAdmin [EMAIL PROTECTED] 166c166 LogLevel debug2 --- LogLevel info 477c477 BrowseAddress @IF(eth0) --- #BrowseAddress @IF(name) root# Now I have a few question: 1.) What does the number mean [at diff]? The numbers indicates the point at which where the two files diverge. So the first one (56c56) indicates that line 56 in each file differs. NOTE: the 'c' indicates a change, there are other letters for different types of changes. You should take a look at the diff man page for details 2.) What do and mean ? Assuming you're doing # diff FILE-A FILE-B '' indicates the contents of FILE-A '' indicates the contents of FILE-B note: when running etc-update, the diff it shows you is FILE-A is the original (your version), FILE-B is the update (which you downloaded when you emerged). 3.) What does the broken line mean ? By this I assume you mean the ---. This is just a separator between the two versions of the changed part of the file. 4.) How would I fix this cupsd.conf thing? In this particular case, it looks like there aren't any important changes (unless you want to change the LogLevel setting), so you could just delete the change. This should be in the list of choices etc-update gives you. - PK Thank you, ZiM __ Do you Yahoo!? SBC Yahoo! DSL - Now only $29.95 per month! http://sbc.yahoo.com -- [EMAIL PROTECTED] mailing list -- [EMAIL PROTECTED] mailing list
Re: [gentoo-user] n config files in /etc need updating
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, 56c56 ServerAdmin [EMAIL PROTECTED] --- #ServerAdmin [EMAIL PROTECTED] 166c166 LogLevel debug2 --- LogLevel info 477c477 BrowseAddress @IF(eth0) --- #BrowseAddress @IF(name) That's the output from diff, Now I have a few question: 1.) What does the number mean [at diff]? The numbers (for example 56c56) are the line numbers, 2.) What do and mean ? from the file 1 (original), from the file 2 (new one), 3.) What does the broken line mean ? I'd like to answer this, but i don't see any broken line, sorry, 4.) How would I fix this cupsd.conf thing? Just delete the new file with your own. etc-update will give you easy to follow instructions to do so. The general output seems to be: origfilelinenum c newfilelinenum different line from orig file [or more than one difference] - --- different line from new file [or more than one difference] In this exact case, there is no need to do anything in your new conf file, just follow the instructions from etc-update to delete the new file, but sometimes there are new versions of programs that need a new format for their conf files, so you should check that everytime. Cheers, - -- Juan Ángel PGP key on pgp.rediris.es (8FAF18B7) or search on http://www.rediris.es/cert/servicios/keyserver/ -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.2 (GNU/Linux) iD8DBQE++jcMaQjbS4+vGLcRAukiAJ9bVNMRQEojIFV8xVwj/YlNlJc9twCgkh2L bBU98Hgsila4/6XNdiEDZaE= =zs6P -END PGP SIGNATURE- -- [EMAIL PROTECTED] mailing list
Re: [gentoo-user] n config files in /etc need updating
On Wed, Jun 25, 2003 at 04:14:37PM -0700, Gëzim Hoxha wrote: Now I have a few question: 1.) What does the number mean [at diff]? 2.) What do and mean ? 3.) What does the broken line mean ? 4.) How would I fix this cupsd.conf thing? Thank you, ZiM Not sure if this is opinion or if everyone would agree, but if I were you, I would do: diff -u cupsd.conf ._cfg_cupsd.conf which would produce output something like this: --- cupsd.conf 2003-06-25 21:46:08.0 -0500 +++ ._cfg_cupsd.conf2003-03-02 16:21:50.0 -0600 @@ -53,7 +53,7 @@ # By default CUPS will use [EMAIL PROTECTED]. # -ServerAdmin [EMAIL PROTECTED] +#ServerAdmin [EMAIL PROTECTED] @@ -163,7 +163,7 @@ # none Log nothing. # -LogLevel debug2 +LogLevel info # # MaxLogSize: controls the maximum size of each log file before they are @@ -474,7 +474,7 @@ #BrowseAddress x.255.255.255 #BrowseAddress 255.255.255.255 #BrowseAddress @LOCAL -BrowseAddress @IF(eth0) +#BrowseAddress @IF(name) # # BrowseShortNames: whether or not to use short names for remote printers The numbers are again line numbers in the arg1 and arg2 versions of the file (cupsd.conf and ._cfg_cupsd.conf), a line starting with - is only in cupsd.conf, and a line starting with + is only in ._cfg_cupsd.conf. If you pipe it to a file whose name ends in .diff or .patch, and open it in vim, it will be colorized, for easy reading: diff -u cupsd.conf ._cfg_cupsd.conf cupsd.diff vim cupsd.diff - richard -- Richard Kilgore [EMAIL PROTECTED] -- [EMAIL PROTECTED] mailing list
