[Piuparts-commits] [piuparts] 01/02: Switch ubuntu default to 'utopic'...

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 34977dc555872787730a3dd630593d387b343c7b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Apr 30 13:40:18 2014 +0200

    Switch ubuntu default to 'utopic'...
---
 debian/changelog       | 3 ++-
 piuparts.py            | 2 +-
 tests/test_piuparts.py | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 816110d..93e78ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,8 @@ piuparts (0.58) UNRELEASED; urgency=low
     apache2.4 transition. (Closes: #712384)
   * piuparts.1.txt: explain that --do-not-verify-signatures also causes
     APT::Get::AllowUnauthenticated to be set accordingly in the chroots.
-  * Switch ubuntu default to 'trusty'. (Closes: #744848)
+  * Switch ubuntu default to 'trusty'. (Closes: #744848). Then switch it to
+    'utopic'...
 
   [ Andreas Beckmann ]
   * piupartslib/packagesdb.py:
diff --git a/piuparts.py b/piuparts.py
index dde1b84..32f651b 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -109,7 +109,7 @@ class UbuntuDefaults(Defaults):
         return [("http://archive.ubuntu.com/ubuntu", self.get_components())]
 
     def get_distribution(self):
-        return ["trusty"]
+        return ["utopic"]
 
     def get_keyring(self):
         return "/usr/share/keyrings/ubuntu-archive-keyring.gpg"
diff --git a/tests/test_piuparts.py b/tests/test_piuparts.py
index 47fcce7..9e4deea 100644
--- a/tests/test_piuparts.py
+++ b/tests/test_piuparts.py
@@ -42,7 +42,7 @@ class DefaultsFactoryTests(unittest.TestCase):
         self.assertEqual(defaults.get_keyring(), '/usr/share/keyrings/ubuntu-archive-keyring.gpg')
         self.assertEqual(defaults.get_components(), ["main", "universe", "restricted", "multiverse"])
         self.assertEqual(defaults.get_mirror(), [("http://archive.ubuntu.com/ubuntu", ["main", "universe", "restricted", "multiverse"])])
-        self.assertEqual(defaults.get_distribution(), ['trusty'])
+        self.assertEqual(defaults.get_distribution(), ['utopic'])
 
     def test_new_defaults_panics_with_unknown_flavor(self):
         # mock the guess_flavor function as it runs lsb_release in a subprocess

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git