Re: [Fink-devel] fink vs modified info files

2009-04-27 Thread Daniel Macks
On Mon, Apr 27, 2009 at 01:45:28PM -0400, Benjamin Reed wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
> 
> Jack Howarth wrote:
> >
> > Scanning package description filesWARNING: Unresolved CVS conflicts in 
> > "/sw/fink/dists/unstable/main/finkinfo/sci/ccp4.info".
> > WARNING: Repeated occurrence of field "depends" at line 61 of 
> > "/sw/fink/dists/unstable/main/finkinfo/sci/ccp4.info".
> > WARNING: Repeated occurrence of field "builddepends" at line 62 of 
> > "/sw/fink/dists/unstable/main/finkinfo/sci/ccp4.info".
> > WARNING: Repeated occurrence of field "buildconflicts" at line 63 of 
> > "/sw/fink/dists/unstable/main/finkinfo/sci/ccp4.info".
> > 
> > It should clearly state these are unresolved merges in the info
> > file and request the user to solve them or delete the file and
> > pull it down again.
> 
> That said, it's probably better to make this an ERROR instead of a
> WARNING and dump right out, so people don't think this is something they
> can ignore, or lose in the middle of the output somewhere.

Aborting during indexing, especially the automatic indexing that
happens after a selfupdate, is a Bad Idea because the automatic update
of the Essential packages won't happen. We could make the warning
louder and less buried. I *think* these files are not indexed (assumed
to be in a broken state). And if there's a CVS conflict, we already
know the file is in a broken state, so why bother even looking further
and noticing the dup fields? We might be able to set a Finally message
about it, but in the grand scheme of things, this is both a rare
problem and not a serious one: if you're doing this kind of editing,
you already (should at least!) know you're at risk for CVS
conflicts. And so what? So there's a file that needs to be fixed
before its contents can be used...that has zero effect beyond whatever
packages you're hacking in that one file.

dan

-- 
Daniel Macks
dma...@netspace.org
http://www.netspace.org/~dmacks


--
Register Now & Save for Velocity, the Web Performance & Operations 
Conference from O'Reilly Media. Velocity features a full day of 
expert-led, hands-on workshops and two days of sessions from industry 
leaders in dedicated Performance & Operations tracks. Use code vel09scf 
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
___
Fink-devel mailing list
Fink-devel@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.devel


Re: [Fink-devel] fink vs modified info files

2009-04-27 Thread Benjamin Reed
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Jack Howarth wrote:
>   One minor nit that I have with 'fink selfupdate' is that is
> doesn't give sensible output if you have edited info files in
> your fink directories. It would be nice if fink could recognize
> the diff format that is produced in such cases and give the user
> a sensible warning instead of just

Generally, users should not be editing the info files in-place, and
instead should copy the file to their "local" tree.  (Packagers should
already know such things, and when we tell users about working around a
temporary issue, we usually remember to recommend they copy it to local
and edit it there.)

> Scanning package description filesWARNING: Unresolved CVS conflicts in 
> "/sw/fink/dists/unstable/main/finkinfo/sci/ccp4.info".
> WARNING: Repeated occurrence of field "depends" at line 61 of 
> "/sw/fink/dists/unstable/main/finkinfo/sci/ccp4.info".
> WARNING: Repeated occurrence of field "builddepends" at line 62 of 
> "/sw/fink/dists/unstable/main/finkinfo/sci/ccp4.info".
> WARNING: Repeated occurrence of field "buildconflicts" at line 63 of 
> "/sw/fink/dists/unstable/main/finkinfo/sci/ccp4.info".
> 
> It should clearly state these are unresolved merges in the info
> file and request the user to solve them or delete the file and
> pull it down again.

That said, it's probably better to make this an ERROR instead of a
WARNING and dump right out, so people don't think this is something they
can ignore, or lose in the middle of the output somewhere.

- --
Benjamin Reed a.k.a. Ranger Rick
Fink, KDE, and Mac OS X development

Blog: http://www.raccoonfink.com/
Music: http://music.raccoonfink.com/

-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFJ9e84Uu+jZtP2Zf4RAu5sAJ9BPaYeNxOOIMIn5aqCB0MiS0LVyACcDlZX
7p0RNr9w354G0TCTo0UEyUs=
=EBPS
-END PGP SIGNATURE-

--
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensign option that enables unlimited
royalty-free distribution of the report engine for externally facing 
server and web deployment.
http://p.sf.net/sfu/businessobjects
___
Fink-devel mailing list
Fink-devel@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.devel