Merge lp:~xnox/ubuntu-dev-tools/always-sync-unstable into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

[Dimitri John Ledkov]

[Felix Geyer (debfx)]

doc/syncpackage.1, requestsync and doc/requestsync.1 need to be updated as well.

review: Needs Fixing

[lp:~xnox/ubuntu-dev-tools/always-sync-unstable]

1401. By Dimitri John Ledkov on 2013-10-22

Fix syncpackage manpage

1402. By Dimitri John Ledkov on 2013-10-22

  always done from unstable. Adjust requstsync & syncpackage to always
  default to unstable.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-14 20:09:27 +0000
+++ debian/changelog	2013-10-22 18:03:49 +0000
@@ -1,3 +1,11 @@
+ubuntu-dev-tools (0.151) UNRELEASED; urgency=low
+
+  * Since Britney migration was introduced in Ubuntu, automatic syncing is
+    always done from unstable. Adjust requstsync & syncpackage to always
+    default to unstable.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Tue, 22 Oct 2013 17:02:41 +0100
+
 ubuntu-dev-tools (0.150) unstable; urgency=low
 
   [ Brian Murray ]
 
=== modified file 'doc/requestsync.1'
--- doc/requestsync.1	2012-02-11 19:59:46 +0000
+++ doc/requestsync.1	2013-10-22 18:03:49 +0000
@@ -44,7 +44,7 @@
 .TP
 .B \-d
 Specifies which Debian distribution a package should be synced from.
-Default is \fItesting\fR in LTS cycles, otherwise \fIunstable\fR.
+Default is \fIunstable\fR.
 .TP
 .B \-n
 Specifies that the package is a new package, and requestsync should not
 
=== modified file 'doc/syncpackage.1'
--- doc/syncpackage.1	2013-04-20 10:09:10 +0000
+++ doc/syncpackage.1	2013-10-22 18:03:49 +0000
@@ -35,8 +35,7 @@
 Show help message and exit
 .TP
 \fB\-d\fI DIST\fR, \fB\-\-distribution\fR=\fIDIST\fR
-Debian distribution to sync from. Default is \fItesting\fR during LTS
-cycles, and \fIunstable\fR otherwise.
+Debian distribution to sync from. Default is \fIunstable\fR.
 .TP
 \fB\-r\fI RELEASE\fR, \fB\-\-release\fR=\fIRELEASE\fR
 Specify target Ubuntu release. Default: current development release.
 
=== modified file 'requestsync'
--- requestsync	2012-10-30 09:18:17 +0000
+++ requestsync	2013-10-22 18:03:49 +0000
@@ -45,11 +45,6 @@
 def main():
     ubu_info = UbuntuDistroInfo()
     DEFAULT_SOURCE = 'unstable'
-    try:
-        if ubu_info.is_lts(ubu_info.devel()):
-            DEFAULT_SOURCE = 'testing'
-    except DistroDataOutdated, e:
-        print >> sys.stderr, str(e)
 
     # Our usage options.
     usage = ('Usage: %prog [options] '
 
=== modified file 'syncpackage'
--- syncpackage	2013-03-18 23:18:02 +0000
+++ syncpackage	2013-10-22 18:03:49 +0000
@@ -294,15 +294,7 @@
         return DebianSourcePackage(dscfile=package, mirrors=mirrors)
 
     if dist is None:
-        ubu_info = UbuntuDistroInfo()
-        try:
-            if ubu_info.is_lts(ubu_info.devel()):
-                dist = 'testing'
-            else:
-                dist = 'unstable'
-        except DistroDataOutdated, e:
-            Logger.warn(e)
-            dist = 'unstable'
+        dist = 'unstable'
 
     requested_version = version
     if type(version) == str: