From 2cfb65133693baff24c89b7895930d21a9db5db6 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 14 Mar 2009 12:16:32 +0000 Subject: [PATCH] * requestsync: Reverted old madison.php workaround (LP: #183346). --- debian/changelog | 1 + requestsync | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cb57b9b..d7c3140 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ubuntu-dev-tools (0.67) UNRELEASED; urgency=low * mk-sbuild-lv: Changed default behaviour so that the initial build and log directories are not created on first run; instead read settings file and check if they exist (LP: #342154). + * requestsync: Reverted old madison.php workaround (LP: #183346). -- Jonathan Davies Mon, 09 Mar 2009 16:03:09 +0000 diff --git a/requestsync b/requestsync index ad24ae5..add7787 100755 --- a/requestsync +++ b/requestsync @@ -179,8 +179,13 @@ def cur_deb_version(sourcepkg, distro): except AssertionError: print "%s doesn't appear to exist in Debian." % sourcepkg sys.exit(1) - - return out.split('|')[1].strip() + # Work-around for a bug in Debians madison.php script not returning + # only the source line + for line in out.splitlines(): + if line.find('source') > 0: + out = line + + return out.split('|')[1].rstrip('[]''').strip() def debian_changelog(sourcepkg, component, version): '''Return the Debian changelog from the latest up to the given version