* Niko Tyni <nt...@debian.org> [101103 08:33]:
> > > In that case I suppose this becomes two wishlist items:
> > >
> > > - support for importing .dsc files with subdirectories in debian/patches
> >
> > This one definitly makes sense.
[...]
>
> OK, thanks. Cloning. FWIW the attached quick patch seems to work for me
> for the first issue.

> diff --git a/git-dpm.sh b/git-dpm.sh
> index 478795e..6f40246 100755
> --- a/git-dpm.sh
> +++ b/git-dpm.sh
> @@ -1962,8 +1962,9 @@ function apply_patches() {
>       num_lines=0
>       while read filename option options ; do
>               if [ x"$filename" != x"${filename##*/}" ] ; then
> -                     printerror "patch filename contains slash!"
> -                     return 1
> +                     dirname=$(dirname "$filename")
> +                     [ -d "$dirname" ] || mkdir --parents "$dirname" || 
> return 1
> +                     [ -d "$gitdir/dpm/import/$dirname" ] || mkdir 
> "$gitdir/dpm/import/$dirname" || return 1

Is the first one of those actually needed? or only the second?

I've applied a slightly different approach of just replacing slashes
with something else in the temporary files.

If you want to take a look, the current development version is available
via

git clone --branch master git://git.debian.org/git/git-dpm/git-dpm.git

You can ignore all the auto* and just use git-dpm.sh to test it.
(the shell script is fully self-contained).

        Bernhard R. Link



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to