The following commit has been merged in the master branch:
commit 33153126584604a965f5d215e156c3fb07c54095
Author: James Vega <[email protected]>
Date: Wed Jul 7 22:54:01 2010 -0400
Remove --ignore-dirname after 6.5 years of being unsupported.
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 0d67ef5..7f2247f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ devscripts (2.10.65) UNRELEASED; urgency=low
save it. (Closes: #584735)
+ Do not remove the destination directory when --force is given. (Closes:
#587517)
+ * Remove --ignore-dirname options (and deprecation notices) from all
+ scripts. 6.5 years is long enough to stop using that option.
[ Martin Zobel-Helas ]
* Remove svk from Recommends, it is no longer in the archive. (Closes:
diff --git a/scripts/cvs-debuild.pl b/scripts/cvs-debuild.pl
index 53c577b..80a2527 100755
--- a/scripts/cvs-debuild.pl
+++ b/scripts/cvs-debuild.pl
@@ -120,7 +120,7 @@ my (@debuild_opts, @cvs_opts, @lin_opts);
push @debuild_opts, $arg;
next;
}
- if ($arg =~ /^--(preserve-env|ignore-dirname)$/) {
+ if ($arg =~ /^--preserve-env$/) {
push @debuild_opts, $arg;
next;
}
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 51cc70c..f000523 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -300,7 +300,7 @@ my ($opt_help, $opt_version);
my ($opt_i, $opt_a, $opt_e, $opt_r, $opt_v, $opt_b, $opt_d, $opt_D, $opt_u,
$opt_force_dist);
my ($opt_n, $opt_bn, $opt_qa, $opt_s, $opt_bpo, $opt_l, $opt_c, $opt_m,
$opt_create, $opt_package, @closes);
my ($opt_news);
-my ($opt_ignore, $opt_level, $opt_regex, $opt_noconf, $opt_empty);
+my ($opt_level, $opt_regex, $opt_noconf, $opt_empty);
Getopt::Long::Configure('bundling');
GetOptions("help|h" => \$opt_help,
@@ -334,7 +334,6 @@ GetOptions("help|h" => \$opt_help,
"multi-maint!" => \$opt_multimaint,
"m|maintmaint" => \$opt_m,
"t|mainttrailer!" => \$opt_t,
- "ignore-dirname" => \$opt_ignore,
"check-dirname-level=s" => \$opt_level,
"check-dirname-regex=s" => \$opt_regex,
"noconf" => \$opt_noconf,
@@ -363,11 +362,6 @@ if ($opt_noconf) {
if ($opt_help) { usage; exit 0; }
if ($opt_version) { version; exit 0; }
-# dirname stuff
-if ($opt_ignore) {
- fatal "--ignore-dirname has been replaced by --check-dirname-level
and\n--check-dirname-regex; run $progname --help for more details";
-}
-
if (defined $opt_level) {
if ($opt_level =~ /^[012]$/) { $check_dirname_level = $opt_level; }
else {
diff --git a/scripts/debi.pl b/scripts/debi.pl
index 487ac3e..cbce583 100755
--- a/scripts/debi.pl
+++ b/scripts/debi.pl
@@ -65,7 +65,7 @@ Usage: $progname [options] [.changes file] [package ...]
--with-depends Install packages with their depends.
--tool TOOL Use the specified tool for installing the dependencies
of the package(s) to be installed.
- (default: apt-get)
+ (default: apt-get)
--help Show this message
--version Show version and copyright information
@@ -181,7 +181,7 @@ if (@ARGV and $ARGV[0] =~ /^--no-?conf$/) {
# Command line options next
my ($opt_help, $opt_version, $opt_a, $opt_t, $opt_debsdir, $opt_multi);
my $opt_upgrade;
-my ($opt_ignore, $opt_level, $opt_regex, $opt_noconf);
+my ($opt_level, $opt_regex, $opt_noconf);
my ($opt_tool, $opt_with_depends);
GetOptions("help" => \$opt_help,
"version" => \$opt_version,
@@ -190,7 +190,6 @@ GetOptions("help" => \$opt_help,
"debs-dir=s" => \$opt_debsdir,
"multi" => \$opt_multi,
"upgrade" => \$opt_upgrade,
- "ignore-dirname" => \$opt_ignore,
"check-dirname-level=s" => \$opt_level,
"check-dirname-regex=s" => \$opt_regex,
"with-depends" => \$opt_with_depends,
@@ -223,11 +222,6 @@ if ($debsdir_warning) {
die "$progname: $debsdir_warning\n";
}
-# dirname stuff
-if ($opt_ignore) {
- die "$progname: --ignore-dirname has been replaced by
--check-dirname-level and\n--check-dirname-regex; run $progname --help for more
details\n";
-}
-
if (defined $opt_level) {
if ($opt_level =~ /^[012]$/) { $check_dirname_level = $opt_level; }
else {
@@ -254,7 +248,6 @@ if ($? != 0 or ! $arch) {
}
chomp $arch;
-
my $chdir = 0;
if (! defined $changes) {
diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index 777bc81..fc903f8 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -498,9 +498,6 @@ my @preserve_vars = qw(TERM HOME LOGNAME PGPPATH GNUPGHOME
GPG_AGENT_INFO
$arg eq '--tgz-check' and $tgz_check=1, next;
$arg =~ /^--no-?tgz-check$/ and $tgz_check=0, next;
$arg =~ /^-r(.*)/ and $root_command=$1, next;
- if ($arg eq '--ignore-dirname') {
- fatal "--ignore-dirname has been replaced by --check-dirname-level
and\n--check-dirname-regex; run $progname --help for more details";
- }
if ($arg =~ /^--check-dirname-level=(.*)$/) {
$arg = '--check-dirname-level';
unshift @ARGV, $1;
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index a170219..c59b921 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -260,7 +260,7 @@ if (@ARGV and $ARGV[0] =~ /^--no-?conf$/) {
my $debug = 0;
my ($opt_h, $opt_v, $opt_destdir, $opt_download, $opt_force_download,
$opt_report, $opt_passive, $opt_symlink, $opt_repack);
-my ($opt_verbose, $opt_ignore, $opt_level, $opt_regex, $opt_noconf);
+my ($opt_verbose, $opt_level, $opt_regex, $opt_noconf);
my ($opt_package, $opt_uversion, $opt_watchfile, $opt_dehs, $opt_timeout);
my $opt_download_version;
my $opt_user_agent;
@@ -285,7 +285,6 @@ GetOptions("help" => \$opt_h,
"dehs!" => \$opt_dehs,
"verbose!" => \$opt_verbose,
"debug" => \$debug,
- "ignore-dirname" => \$opt_ignore,
"check-dirname-level=s" => \$opt_level,
"check-dirname-regex=s" => \$opt_regex,
"user-agent=s" => \$opt_user_agent,
@@ -322,11 +321,6 @@ if ($dehs) {
$SIG{'__DIE__'} = \&dehs_die;
}
-# dirname stuff
-if ($opt_ignore) {
- die "$progname: --ignore-dirname has been replaced by
--check-dirname-level and\n--check-dirname-regex; run $progname --help for more
details\n";
-}
-
if (defined $opt_level) {
if ($opt_level =~ /^[012]$/) { $check_dirname_level = $opt_level; }
else {
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
