Am Dienstag, den 03.07.2007, 21:51 +0900 schrieb Junichi Uekawa:
> Hi,
>
> > > There are two comments
> > >
> > > 1. dpatch.conf is read from other tools as well; which means, changing
> > > dpep is not enough for providing the configuration information; do you
> > > really need it?
> >
> > What do you mean? My proposal consists of 2 parts.
> >
> > (1) Move the PACKAGENAME and UPSTREAMVERSION variable determination
> > before including the config files. This means, that my config file can
> > contain:
> >
> > conf_origtargzpath="/usr/local/src/packages/${PACKAGENAME}"
> >
> > and PACKAGENAME will be automatically replaced by it's correct value.
> > With the current solution, to determine it later, I cannot do this. The
> > above usage is nice for simply doing `dpatch-edit-patch -b' inside SVN
> > debian/-only directories (e.g. svn-buildpackage in
> > mergeWithUpstream-mode). I don't think, this will affect other parts or
> > tools. The variables are used only once inside dpatch-edit-patch to
> > determine ORIGTARGZ.
>
> dpatch.conf is sourced from 'dpatch' and other tools. That said, I
> guess a few undefined variables won't harm people.
I see. I checked your source and found, that a similar situation can be
found in dpatch-cowdancer-patch. So doing the proposed change here too,
should fix any appearing issues. I could not find any other relvant
place, where conf_origtargzpath is used.
However I now also found out, that I could also put the PACKAGENAME
determination into ~/.dpatch.conf before defining conf_origtargzpath and
it works too. But then there are 2 places, where PACKAGENAME is
determined. I would prefer the clean solution and simply put the
determination before including the config files.
> > (2) The second part is a minor change in the handling of the
> > -b|--debianonly option. The manpage currently reads:
> >
> > "[..] --debianonly[=path] [..] The optional argument is the path to the
> > upstream tarball. [..]"
> >
> > To my understanding this says, that I only need to give the path (not
> > the path + the tarball name). And this was a valuable guess, because
> > from debian/changelog I can guess, how the upstream tarball is called:
> > see ORIGTARGZ variable. But in reality, this option expected the full
> > path + the name of the upstream tarball. Because I can guess the latter,
> > I changed the option to accept only a path too. Depending of the given
> > argument is a directory, the argument then simply is set as
> > DPEP_ORIGTARGZPATH or DPEP_ORIGTARGZ. Do you think, this could affect
> > other parts/tools?
>
> So the documentation should be updated to:
>
> "[..] --debianonly[=path] [..] The optional argument is the full path
> to the upstream tarball or the path of the directory containing the
> upstream tarball. [..]"
[..] In the latter case, the tarball name is guessed accordingly to what
can be found in debian/changelog [..]
or similar (for the real "noobs" :)).
> > > 2. documentation (manual) probably needs updating, how should it be
> > > updated?
> >
> > I think, you can add my .dpatch.conf content as example to show, that
> > something like this is possible. And if you accept the second change
> > too, than you can clarify, that the --debianonly option accepts a path
> > (and therein searches for the expected upstream tarball) or path
> > +tarball-name.
>
> Could you craft a full patch?
I will attach it to a later mail.
Regards, Daniel
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
