On Wed, Sep 05, 2007 at 11:22:38PM +0300, Jari Aalto wrote:
> Here is patch to make -I behave like -i, that is to supply default option
> of given standalone.
I like the general idea, but there are some issues with the patch.
> --- a/scripts/dpkg-source.pl
> +++ b/scripts/dpkg-source.pl
> @@ -31,9 +31,40 @@ my $diff_ignore_default_regexp = '
> (?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore|\.gitignore)$|
> # File or directory names that should be ignored
> (?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git|
> -\.shelf|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
> +_MTN|\.shelf|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
> ';
This hunk clearly doesn't belongs to this patch. I will add it myself.
> +my $diff_I_opt_default_regexp = "
> +--exclude=.[#~]*
> +--exclude=*[#~]
> +--exclude='{arch}'
> +--exclude=.a
> +--exclude=.arch-ids
> +--exclude=.arch-inventory
> +--exclude=.bzr
> +--exclude=.bzr.backup
> +--exclude=.bzr.tags
> +--exclude=.bzrignore
> +--exclude=.cvsignore
> +--exclude=.deps
> +--exclude=.git
> +--exclude=.gitignore
> +--exclude=.hg
> +--exclude=.la
> +--exclude=.o
> +--exclude=.shelf
> +--exclude=.so
> +--exclude=.svn
> +--exclude=.swp
> +--exclude=CVS
> +--exclude=DEADJOE
> +--exclude=RCS
> +--exclude=_MTN
> +--exclude=_darcs
> +";
> +
> +$diff_I_opt_default_regexp =~ s/#*\s*[\r\n]+//gm;
It would probably be better to add the --exclude after the fact since
that is just redundant here and will bloat the usage message. Also
the variable is wrongly named since -I has nothing to do with the
diff...
> --- a/man/dpkg-source.1
> +++ b/man/dpkg-source.1
> @@ -126,12 +126,19 @@ from the ones in your working directory, thus causing
> them to be
> unnecessarily included in every .diff.gz, unless you use the \fB\-i\fR
> switch.
> .TP
> -.BI \-I filename
> -If this option is specified, the filename will be passed to tar's \-\-exclude
> -option when it is called to generate a .orig.tar.gz or .tar.gz file. For
> -example, \-ICVS will make tar skip over CVS directories when generating
> -a .tar.gz file. The option may be repeated multiple times to list multiple
> -filenames to exclude.
> +.BI \-I[\fIfile-pattern\fP]
> +
> +If this option is specified, the filename pattern will be passed to
> +tar's \-\-exclude option when it is called to generate a .orig.tar.gz
> +or .tar.gz file. For example, \-ICVS will make tar skip over CVS
> +directories when generating a .tar.gz file. The option may be repeated
> +multiple times to list multiple filenames to exclude. If this option
> +is givel
Looks broken.
> +
> +\fB\-I\fR by itself adds default tar(1) \-\-exclude options that will
> +filter out control files and directories of the most common revision
> +control systems, backup and swap files and Libtool build output
> +directories.
> .PP
> All the
> .BI \-s X
(If you want to provide a fixed patch, please provide a complete one,
not incremental ones on the last version.
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
