The following commit has been merged in the master branch:
commit db51d4004cdb175c7957b30d7bc5fcae873dd6c1
Author: Christoph Berg <[email protected]>
Date: Sat Aug 11 15:31:35 2012 +0200
debcheckout: When --package is given, use this package name rather than
trying to guess it from the url. Useful for URLs like
http://anonscm.debian.org/bzr/pkg-postgresql/postgresql-9.2/sid-pgapt/.
diff --git a/debian/changelog b/debian/changelog
index 6dacaee..b17f36b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,11 @@ devscripts (2.12.2) UNRELEASED; urgency=low
instead of downloading them all but only keeping the oldest. (Closes:
#683231)
+ [ Christoph Berg ]
+ * debcheckout: When --package is given, use this package name rather than
+ trying to guess it from the url. Useful for URLs like
+ http://anonscm.debian.org/bzr/pkg-postgresql/postgresql-9.2/sid-pgapt/.
+
-- Benjamin Drung <[email protected]> Thu, 26 Jul 2012 12:17:51 +0200
devscripts (2.12.1) unstable; urgency=low
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index f6ccdcc..a8270c8 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -103,6 +103,11 @@ uses "static" information as known by APT's cache.
Also see B<-d>. This option and B<-d> are mutually exclusive.
+=item B<--package> I<package>
+
+When checking out a repository URL, instead of trying to guess the package name
+from the URL, use this package name.
+
=item B<-t> I<TYPE>, B<--type> I<TYPE>
Override the repository type (which defaults to some heuristics based
@@ -970,6 +975,7 @@ sub main() {
my $origtgz_name = undef; # orig.tar.gz name (or "" when none; undef means
unknown)
my $print_mode = 0; # print only mode
my $details_mode = 0; # details only mode
+ my $use_package = ''; # use this package instead of guessing from the URL
my $repo_type = "svn"; # default repo typo, overridden by '-t'
my $repo_url = ""; # repository URL
my $user = ""; # login name (authenticated mode only)
@@ -981,6 +987,7 @@ sub main() {
"help|h" => sub { pod2usage({-exitval => 0, -verbose => 1}); },
"print|p" => \$print_mode,
"details|d" => \$details_mode,
+ "package|p=s" => \$use_package,
"type|t=s" => \$repo_type,
"user|u=s" => \$user,
"file|f=s" => sub { push(@files, $_[1]); },
@@ -1009,8 +1016,12 @@ sub main() {
$repo_url = $ARGV[0];
$repo_type = guess_repo_type($repo_url, $repo_type);
$pkg = ""; $version = "";
- # guess package from url
- if ($repo_url =~ m!/trunk/([a-z0-9.+-]+)!) { # svn with
{trunk,tags,branches}/$pkg
+ # when --package is given, use it
+ if ($use_package) {
+ $pkg = $use_package;
+ $origtgz_name = $use_package; # FIXME: this should rather set
srcpkg in unpack_source() directly
+ # else guess package from url
+ } elsif ($repo_url =~ m!/trunk/([a-z0-9.+-]+)!) { # svn with
{trunk,tags,branches}/$pkg
$pkg = $1;
} elsif ($repo_url =~ m!([a-z0-9.+-]+)/trunk/?!) { # svn with
$pkg/{trunk,tags,branches}
$pkg = $1;
--
Git repository for devscripts
_______________________________________________
devscripts-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
