From a13d42f824d73bf122ba2812e43d9e610bd2e193 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <bdrung@ubuntu.com>
Date: Sat, 27 Mar 2010 15:16:52 +0100
Subject: [PATCH] Don't hardcode lucid.

---
 ack-sync | 22 ++++++++++------------
 fakesync | 17 +++++++----------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/ack-sync b/ack-sync
index bac51ec..f212bf4 100755
--- a/ack-sync
+++ b/ack-sync
@@ -32,7 +32,7 @@ COMMAND_LINE_SYNTAX_ERROR = 1
 VERSION_DETECTION_FAILED = 2
 
 def get_version(title):
-	m = re.search("[() ][0-9][0-9a-zA-Z.:+-]*", title)
+	m = re.search("[() ][0-9][0-9a-zA-Z.:+-~]*", title)
 	if m is None:
 		print >> sys.stderr, "Version could not be detected. Please specify it with -V."
 		sys.exit(VERSION_DETECTION_FAILED)
@@ -69,9 +69,7 @@ def get_source(package, version, section):
 	subprocess.check_call(["dget", "-u", location])
 	return dsc_file
 
-def build_source(dsc_file):
-	# TODO: use release-info (once available)
-	dist = "lucid"
+def build_source(dist, dsc_file):
 	try:
 		if sbuild:
 			subprocess.check_call(LogCall(["sbuild", "-c", dist,"-A", dsc_file]))
@@ -83,9 +81,7 @@ def build_source(dsc_file):
 		print >> sys.stderr, "E: %s failed to build." % (dsc_file)
 		sys.exit(1)
 
-def test_install(dsc_file):
-	# TODO: use release-info (once available)
-	dist = "lucid"
+def test_install(dist, dsc_file):
 	changes_files=glob.glob(os.path.splitext(dsc_file)[0]+"_*.changes")
 	changes_file = ""
 
@@ -110,16 +106,18 @@ def test_install(dsc_file):
 		print >> sys.stderr, "E: %s failed to install. Please check log" % (changes_file)
 
 def main(bug_numbers, package, version, section, update, verbose=False, silent=False):
+	launchpad = get_launchpad("ubuntu-dev-tools")
+	# TODO: use release-info (once available)
+	dist = launchpad.distributions["ubuntu"].current_series.name
+
 	# update pbuilder
 	if update:
 		if sbuild:
 			subprocess.call(LogCall(["sbuild-update", dist]))
 		else:
-			cmd = ["sudo", "env", "DIST=lucid", "pbuilder", "update"]
+			cmd = ["sudo", "env", "DIST=" + dist, "pbuilder", "update"]
 			subprocess.call(LogCall(cmd))
 
-	launchpad = get_launchpad("ubuntu-dev-tools")
-
 	for bug_number in bug_numbers:
 		bug = launchpad.bugs[bug_number]
 
@@ -137,10 +135,10 @@ def main(bug_numbers, package, version, section, update, verbose=False, silent=F
 		print "version:", version
 		dsc_file = get_source(package, version, section)
 
-		build_source(dsc_file)
+		build_source(dist, dsc_file)
 	
 		if piuparts:
-			test_install(dsc_file)
+			test_install(dist, dsc_file)
 
 		print bug.title
 		print task.assignee
diff --git a/fakesync b/fakesync
index fe86de8..cd66395 100755
--- a/fakesync
+++ b/fakesync
@@ -58,12 +58,9 @@ def extract_upstream_version(debian_version):
 
 	return upstream_version
 
-def get_source(package, version, section, bug_number):
+def get_source(package, version, section, bug_number, dist):
 	assert section in ("main", "contrib", "non-free")
 
-	# TODO: use release-info (once available)
-	dist = "lucid"
-
 	workdir = "/tmp/fakesync"
 	if not os.path.isdir(workdir):
 		os.makedirs(workdir)
@@ -105,9 +102,7 @@ def get_source(package, version, section, bug_number):
 
 	return new_dsc_file
 
-def build_source(dsc_file):
-	# TODO: use release-info (once available)
-	dist = "lucid"
+def build_source(dist, dsc_file):
 	try:
 		subprocess.check_call(["sudo", "env", "DIST=" + dist, "pbuilder", "build", dsc_file])
 	except subprocess.CalledProcessError:
@@ -116,6 +111,8 @@ def build_source(dsc_file):
 
 def main(bug_number, package, version, update, verbose=False, silent=False):
 	launchpad = get_launchpad("ubuntu-dev-tools")
+	# TODO: use release-info (once available)
+	dist = launchpad.distributions["ubuntu"].current_series.name
 
 	bug = launchpad.bugs[bug_number]
 
@@ -127,13 +124,13 @@ def main(bug_number, package, version, update, verbose=False, silent=False):
 		version = get_version(bug.title)
 	print "package:", package
 	print "version:", version
-	dsc_file = get_source(package, version, "main", bug_number)
+	dsc_file = get_source(package, version, "main", bug_number, dist)
 	
 	# update pbuilder
 	if update:
-		subprocess.call(["sudo", "env", "DIST=lucid", "pbuilder", "update"])
+		subprocess.call(["sudo", "env", "DIST=" + dist, "pbuilder", "update"])
 	
-	build_source(dsc_file)
+	build_source(dist, dsc_file)
 	
 	print bug.title
 	print task.assignee