requestsync: request syncs from 'testing' by default

(should be changed back to 'unstable' for lucid+1)

debian/changelog

@@ -26,7 +26,11 @@ ubuntu-dev-tools (0.82) UNRELEASED; urgency=low
   * debian/control: re-enable support for python2.5.
   * debian/copyright: update copyright holders.
 
- -- Luca Falavigna <dktrkranz@debian.org>  Sun, 01 Nov 2009 15:58:08 +0100
+  [ Michael Bienia ]
+  * requestsync: request syncs from 'testing' by default (should be changed
+    back to 'unstable' for lucid+1)
+
+ -- Michael Bienia <geser@ubuntu.com>  Mon, 02 Nov 2009 19:01:19 +0100
 
 ubuntu-dev-tools (0.81) karmic; urgency=low
 

requestsync

@@ -47,7 +47,7 @@ if __name__ == '__main__':
 	optParser = OptionParser(usage)
 
 	optParser.add_option('-d', type = 'string',
-		dest = 'dist', default = 'unstable',
+		dest = 'dist', default = 'testing',
 		help = 'Debian distribution to sync from.')
 	optParser.add_option('-k', type = 'string',
 		dest = 'keyid', default = None,

ubuntutools/requestsync/lp.py

@@ -29,9 +29,12 @@ def getDebianSrcPkg(name, release):
 	debian = Distribution('debian')
 	debian_archive = debian.getArchive()
 
-	# Map 'unstable' to 'sid' as LP doesn't know 'unstable' but only 'sid'
-	if release == 'unstable':
-		release = 'sid'
+	# Map 'unstable' and 'testing' to their codenames as LP knows only them
+	codenames = {
+		'unstable': 'sid',
+		'testing': 'squeeze', # Needs updating after each Debian release
+	}
+	release = codenames.get(release, release)
 
 	return debian_archive.getSourcePackage(name, release)