[pacman-dev] Include globbing - Was: Release plans

[Marc - A. Dahlhaus]

Am Montag, den 17.05.2010, 21:17 +1000 schrieb Allan McRae:
> On 17/05/10 18:35, Marc - A. Dahlhaus wrote:
> > Am Mittwoch, den 05.05.2010, 20:08 +0200 schrieb Marc - A. Dahlhaus
> > [ Administration | Westermann GmbH ]:
> >> Am Mittwoch, den 05.05.2010, 16:13 +1000 schrieb Allan McRae:
> >>> On 26/04/10 19:05, Marc - A. Dahlhaus [ Administration | Westermann GmbH
> >>> ] wrote:
> >>>> It handled the GLOB_NOMATCH case silently in the default handler.
> >>>> But a debug print would help alot eg. on typos in include rules.
> >>>> You can find an altered version attached.
> >>>>
> >>>
> >>> The updated version looks fine to me now (although I have not thoroughly
> >>> tested).  We will also need an update to the pacman.conf manpage
> >>> indicating that globbing can be used for Include.
> >>
> >>
> >> As i'm not an english native, is the following correct?
> >>
> >> Marc
> >>
> >> --- a/doc/pacman.conf.5
> >> +++ b/doc/pacman.conf.5
> >> @@ -281,7 +281,7 @@ Instructs pacman to ignore any upgrades
> >>   .PP
> >>   \fBInclude =\fR path
> >>   .RS 4
> >> -Include another config file\&. This file can include repositories or general configuration options\&.
> >> +Include another config file\&. This file can include repositories or general configuration options\&. Wildcards in path get expanded\&.
> >>   .RE
> >>   .PP
> >>   \fBXferCommand =\fR /path/to/command %u
> >>
> >
> > Is there anything still missing on this one?
> >
> 
> It _looks_ fine to me.  However, I have not taken it for a test run yet 
> as the patch did not apply easily with git.
> 
> How are you creating the patch?

I used the last tarball release to work against and master is far away
from the code in the last release with the config parsing and error
reporting that got added.

I rebased the patch against a fresh clone of master.

I also adapted the debug output to contain filename and line as this
would make the outputs really useful on a large include chain.

It builds but i have a problem in my test environment.

I doesn't let me use Include in the global section to include the
repositorys one per file.

This is a behaviour change compared to version 3.3.

Was the removal of support for Include from outside of repository
context in pacman.conf done intentional?

http://projects.archlinux.org/pacman.git/commit/?id=51f9e5e40a7b4c9a2a4bb61562a07946adc2bb2d

The Include directive should work from anywhere in the pacman.conf imo.

> Can you use "git format-patch" and 
> send the entire patch (it looks like the main one is missing the header) 
> either using "git send-email" or less preferably as an attachment.

The work in progress version is Attached.

I still try to change the code to something that works as intended...

Thanks,

Marc

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Allow-to-include-a-path-containing-wildcards.patch
Type: text/x-patch
Size: 3176 bytes
Desc: not available
URL: <http://mailman.archlinux.org/pipermail/pacman-dev/attachments/20100517/d28655e9/attachment.bin>