[ Michael Bienia ]

Update the defaults for maverick and let requestsync and
pull-debian-source default to unstable (lp: #472837).
This commit is contained in:
Michael Bienia 2010-04-20 17:56:51 +02:00
parent 2b34773630
commit 9e89a22c58
7 changed files with 13 additions and 10 deletions

6
debian/changelog vendored
View File

@ -6,7 +6,11 @@ ubuntu-dev-tools (0.99) UNRELEASED; urgency=low
[ Andrey Voronov ] [ Andrey Voronov ]
* pbuilder-dist: change requested/system arch order in check (LP: #557097) * pbuilder-dist: change requested/system arch order in check (LP: #557097)
-- Emmet Hikory <persia@ubuntu.com> Tue, 20 Apr 2010 06:23:28 +0900 [ Michael Bienia ]
* Update the defaults for maverick and let requestsync and
pull-debian-source default to unstable (lp: #472837).
-- Michael Bienia <geser@ubuntu.com> Tue, 20 Apr 2010 17:53:57 +0200
ubuntu-dev-tools (0.98) lucid; urgency=low ubuntu-dev-tools (0.98) lucid; urgency=low

View File

@ -23,7 +23,7 @@ This is the source package that you would like to be downloaded from Debian.
.TP .TP
.B [target release] .B [target release]
This is the release that you would like the source package to be downloaded from. This is the release that you would like the source package to be downloaded from.
This value defaults to 'testing'. This value defaults to 'unstable'.
.SH AUTHOR .SH AUTHOR
.PP .PP

View File

@ -44,7 +44,7 @@ Display a help message and exit.
.TP .TP
.B \-d .B \-d
Specifies which Debian distribution a package should be synced from. Specifies which Debian distribution a package should be synced from.
Default is \fItesting\fR. Default is \fIunstable\fR.
.TP .TP
.B \-n .B \-n
Specifies that the package is a new package, and requestsync should not Specifies that the package is a new package, and requestsync should not

View File

@ -30,7 +30,7 @@ my($package)=$ARGV[0] || &usage();
my($help)=0; my($help)=0;
GetOptions('help' => \$help); GetOptions('help' => \$help);
&usage() if($help); &usage() if($help);
my($release)=$ARGV[1] || 'testing'; my($release)=$ARGV[1] || 'unstable';
$release=&convertCodeName($release); $release=&convertCodeName($release);
&checkRelease($release); &checkRelease($release);
my($dsc)=&getDSC(&getMadison(&getURL($package,$release))); my($dsc)=&getDSC(&getMadison(&getURL($package,$release)));

View File

@ -47,7 +47,7 @@ if __name__ == '__main__':
optParser = OptionParser(usage) optParser = OptionParser(usage)
optParser.add_option('-d', type = 'string', optParser.add_option('-d', type = 'string',
dest = 'dist', default = 'testing', dest = 'dist', default = 'unstable',
help = 'Debian distribution to sync from.') help = 'Debian distribution to sync from.')
optParser.add_option('-k', type = 'string', optParser.add_option('-k', type = 'string',
dest = 'keyid', default = None, dest = 'keyid', default = None,
@ -101,10 +101,9 @@ if __name__ == '__main__':
if len(args) == 1: if len(args) == 1:
if lpapi: if lpapi:
release = Distribution('ubuntu').getDevelopmentSeries().name release = Distribution('ubuntu').getDevelopmentSeries().name
print >> sys.stderr, 'W: Target release missing - assuming %s' % release
else: else:
print >> sys.stderr, 'E: Source package or target release missing. Exiting.' release = 'maverick'
sys.exit(1) print >> sys.stderr, 'W: Target release missing - assuming %s' % release
elif len(args) == 2: elif len(args) == 2:
release = args[1] release = args[1]
elif len(args) == 3: elif len(args) == 3:

View File

@ -75,7 +75,7 @@ my $progname = basename($0);
my $version = '1.0'; my $version = '1.0';
my $dctrl = "/usr/bin/grep-dctrl"; my $dctrl = "/usr/bin/grep-dctrl";
my $sources_path = "/var/lib/apt/lists/"; my $sources_path = "/var/lib/apt/lists/";
my $source_pattern = ".*_dists_lucid_.*Sources\$"; my $source_pattern = ".*_dists_maverick_.*Sources\$";
my @source_files; my @source_files;
my $sources_count=0; my $sources_count=0;
my $opt_debug; my $opt_debug;

View File

@ -90,7 +90,7 @@ def edit_debdiff(debdiff):
run_cmd(cmd) run_cmd(cmd)
def submit_bugreport(body, debdiff, changelog): def submit_bugreport(body, debdiff, changelog):
cmd = 'reportbug -P "User: ubuntu-devel@lists.ubuntu.com" -P "Usertags: origin-ubuntu lucid ubuntu-patch" -T patch -A %s -B debian -i %s -V %s %s' % (debdiff, body, deb_version, changelog.package) cmd = 'reportbug -P "User: ubuntu-devel@lists.ubuntu.com" -P "Usertags: origin-ubuntu maverick ubuntu-patch" -T patch -A %s -B debian -i %s -V %s %s' % (debdiff, body, deb_version, changelog.package)
run_cmd(cmd) run_cmd(cmd)
def run_cmd(cmd): def run_cmd(cmd):