debian/patches 07_bins.dpatch,NONE,1.1 00list,1.3,1.4

[rousseau at haydn.debian.org]

Update of /cvsroot/pkg-bins/debian/patches
In directory haydn:/tmp/cvs-serv22841/debian/patches

Modified Files:
	00list 
Added Files:
	07_bins.dpatch 
Log Message:
exit if target_dir is in source_dir since it will generate an infinite
recursion. Closes: #239250


--- NEW FILE: 07_bins.dpatch ---
#!/bin/sh -e
## bins by Ludovic Rousseau <rousseau at acer.maison.bogus>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description

if [ $# -lt 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"

case "$1" in
       -patch) patch $patch_opts -p0 < $0;;
       -unpatch) patch $patch_opts -p0 -R < $0;;
        *)
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
                exit 1;;
esac

exit 0

@DPATCH@
--- bins	2004-08-05 20:37:01.000000000 +0200
+++ bins	2004-08-13 23:49:03.000000000 +0200
@@ -1031,6 +1031,8 @@
   $picdir = File::Spec->rel2abs(File::Spec->canonpath($picdir));
   $albumdir = File::Spec->rel2abs(File::Spec->canonpath($albumdir));
 
+  die "target_dir ($albumdir) can't be in source_dir ($picdir)" if ($albumdir =~ m/$picdir/);
+
   $picdir =~ s|/*$|/|;
   $albumdir =~ s|/*$|/|;
 

Index: 00list
===================================================================
RCS file: /cvsroot/pkg-bins/debian/patches/00list,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- 00list	31 Jul 2004 20:18:22 -0000	1.3
+++ 00list	13 Aug 2004 21:54:33 -0000	1.4
@@ -4,3 +4,4 @@
 04_bins-edit-gui
 05_install.sh
 06_doc_bins.sgml
+07_bins