use File::Path;
use POSIX;
-open DEBUG, ">&STDERR" or die $!;
-
our $mirror = 'http://mirror.relativity.greenend.org.uk/mirror/debian-ftp/';
our $suite = 'sid';
our $package;
our $changesfile;
our $aliothname = 'iwj@git.debian.org';
-our $aliothpath = '/git/dgit-test';
+our $aliothpath = '/git/dgit-repos';
our $alioth_git = "git+ssh://$aliothname/$aliothpath";
our $alioth_sshtestbodge = [$aliothname,$aliothpath];
+our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
+
our (@git) = qw(git);
our (@dget) = qw(dget);
our (@dput) = qw(dput);
our (@debsign) = qw(debsign);
our $keyid;
+open DEBUG, ">/dev/null" or die $!;
+
our %opts_opt_map = ('dget' => \@dget,
'dput' => \@dput,
'debsign' => \@debsign);
$ua = LWP::UserAgent->new();
$ua->env_proxy;
}
- print DEBUG "fetching @_...\n";
+ print "fetching @_...\n";
my $r = $ua->get(@_) or die $!;
die "$_[0]: ".$r->status_line."; failed.\n" unless $r->is_success;
return $r->decoded_content();
our ($dscdata,$dscurl,$dsc);
+sub printcmd {
+ my $fh = shift @_;
+ my $intro = shift @_;
+ print $fh $intro or die $!;
+ local $_;
+ foreach my $a (@_) {
+ $_ = $a;
+ if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) {
+ print $fh " '$_'" or die $!;
+ } else {
+ print $fh " $_" or die $!;
+ }
+ }
+ print $fh "\n" or die $!;
+}
+
sub runcmd {
+ printcmd(\*DEBUG,"+",@_);
$!=0; $?=0;
die "@_ $! $?" if system @_;
}
sub cmdoutput_errok {
+ printcmd(\*DEBUG,"|",@_);
open P, "-|", @_ or die $!;
my $d;
$!=0; $?=0;
}
sub dryrun_report {
- print "#" or die $!;
- local $_;
- foreach my $a (@_) {
- $_ = $a;
- if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) {
- print " '$_'" or die $!;
- } else {
- print " $_" or die $!;
- }
- }
- print "\n" or die $!;
+ printcmd(\*STDOUT,"#",@_);
}
sub runcmd_ordryrun {
return $c;
}
-sub get_archive_dsc () {
- my $rmad = cmdoutput qw(rmadison -asource),"-s$suite",$package;
+our $rmad;
+
+sub askmadison () {
+ $rmad ||= cmdoutput qw(rmadison -asource),"-s$suite",$package;
$rmad =~ m/^ \s*( [^ \t|]+ )\s* \|
\s*( [^ \t|]+ )\s* \|
\s*( [^ \t|]+ )\s* \|
\s*( [^ \t|]+ )\s* /x or die "$rmad $?";
$1 eq $package or die "$rmad $package ?";
my $vsn = $2;
- $3 eq $suite or die "$rmad $suite ?";
+ if ($suite ne $3) {
+ # madison canonicalises for us
+ print "canonical suite name for $suite is $3\n";
+ $suite = $3;
+ }
$4 eq 'source' or die "$rmad ?";
- # fixme it does not show us the component ?
+ return $vsn;
+}
+
+sub canonicalise_suite () {
+ askmadison();
+}
+
+sub get_archive_dsc () {
+ my $vsn = askmadison();
+ # fixme madison does not show us the component
my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
$dscurl = "$mirror/pool/main/$prefix/$package/${package}_$vsn.dsc";
-#print DEBUG Dumper($pdodata, $&, $dscurl);
$dscdata = url_get($dscurl);
my $dscfh = new IO::File \$dscdata, '<' or die $!;
-#print DEBUG Dumper($dscdata, $dscfh);
+ print DEBUG Dumper($dscdata);
$dsc = Dpkg::Control::Hash->new(allow_pgp=>1);
$dsc->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n";
-#print DEBUG Dumper($dsc);
+ print DEBUG Dumper($dsc);
my $fmt = $dsc->{Format};
- die "unsupported format $fmt, sorry\n" unless $fmt eq '1.0';
+ die "unsupported format $fmt, sorry\n" unless $format_ok{$fmt};
}
sub check_for_git () {
# returns 0 or 1
my $cmd=
"ssh $alioth_sshtestbodge->[0] '".
- " set -e; cd $aliothpath;".
+ " set -e; cd $alioth_sshtestbodge->[1];".
" if test -d $package.git; then echo 1; else echo 0; fi".
"'";
- #print DEBUG "$cmd\n";
+ print DEBUG "$cmd\n";
open P, "$cmd |" or die $!;
$!=0; $?=0;
my $r = <P>; close P;
-#print STDERR ">$r<\n";
+ print DEBUG ">$r<\n";
die "$r $! $?" unless $r =~ m/^[01]$/;
return $r+0;
}
sub is_orig_file ($) {
local ($_) = @_;
- m/\.orig\.tar\.\w+$/;
+ m/\.orig(?:-\w+)?\.tar\.\w+$/;
}
sub generate_commit_from_dsc () {
# (uploadbranch());
$dsc->{$ourdscfield} = rev_parse('HEAD');
$dsc->save("../$dscfn.tmp") or die $!;
- rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
+ if (!$dryrun) {
+ rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
+ } else {
+ print "[new .dsc left in $dscfn.tmp]\n";
+ }
if (!$changesfile) {
my $pat = "../${package}_$clogp->{Version}_*.changes";
my @cs = glob $pat;
die "$pat ?" unless @cs==1;
($changesfile) = @cs;
}
+ my $tag = debiantag($dsc->{Version});
+ if (!check_for_git()) {
+ runcmd_ordryrun qw(ssh),$alioth_sshtestbodge->[0],
+ "set -e; cd $alioth_sshtestbodge->[1];".
+ " mkdir -p $package.git;".
+ " cd $package.git;".
+ " if ! test -d objects; then git init --bare; fi";
+ }
+ runcmd_ordryrun @git, qw(push),$remotename,"HEAD:".lref(uploadbranch());
if ($sign) {
my @tag_cmd = (@git, qw(tag -s -m),
"Release $dsc->{Version} for $suite [dgit]");
push @tag_cmd, qw(-u),$keyid if defined $keyid;
+ push @tag_cmd, $tag;
runcmd_ordryrun @tag_cmd;
my @debsign_cmd = @debsign;
push @debsign_cmd, "-k$keyid" if defined $keyid;
push @debsign_cmd, $changesfile;
runcmd_ordryrun @debsign_cmd;
}
- runcmd_ordryrun @git, qw(push),$remotename,"HEAD:".lref(uploadbranch());
+ runcmd_ordryrun @git, qw(push),$remotename,"refs/tags/$tag";
runcmd_ordryrun @dput, $changesfile;
}
if (@ARGV==0) {
$suite = branchsuite();
$suite ||= $clogp->{Distribution};
+ canonicalise_suite();
print "fetching from suite $suite\n";
} elsif (@ARGV==1) {
($suite) = @ARGV;
+ canonicalise_suite();
} else {
die;
}
$package = $clogp->{Source};
if (@ARGV==0) {
$suite = $clogp->{Distribution};
+ canonicalise_suite();
} else {
die;
}
sub cmd_build {
my $clogp = parsechangelog();
$suite = $clogp->{Distribution};
+ $package = $clogp->{Source};
+ canonicalise_suite();
runcmd_ordryrun
qw(git-buildpackage -us -uc --git-no-sign-tags),
"--git-debian-branch=".uploadbranch(),
while (m/^-./s) {
if (s/^-n/-/) {
$dryrun=1;
+ } elsif (s/^-D/-/) {
+ open DEBUG, ">&STDERR" or die $!;
} elsif (s/^-c(.*=.*)//s) {
push @git, $1;
} elsif (s/^-C(.*)//s) {
~ianmdlvl / dgit.git / blobdiff