[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.51-14-gc0a4dbe

[Holger Levsen]

The following commit has been merged in the bikeshed branch:
commit c0a4dbe0352113221bccb5aa21b563c2bd1a628e
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu May 16 01:55:09 2013 +0200

    piuparts.py: do not print a "Guessed: debian" line (Closes: #703058)

diff --git a/debian/changelog b/debian/changelog
index 9bfb7f3..fbb8673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ piuparts (0.52) UNRELEASED; urgency=low
   [ Holger Levsen ]
   * piuparts-report: add links to Debian QA group and jenkins.debian.net in
     the navigation menu on the left.
+  * piuparts.py: do not print a "Guessed: debian" line on every run. It's the
+    default anyway. (Closes: #703058)
 
  -- Holger Levsen <holger at debian.org>  Wed, 15 May 2013 17:25:41 +0200
 
diff --git a/piuparts.1.txt b/piuparts.1.txt
index d62ddff..f98e1ab 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -57,7 +57,7 @@ The tarball can be created with the '-s' option, or you can use one that *pbuild
   Which Debian distribution to use: a code name (for example squeeze, wheezy or sid) or experimental. The default is sid (=unstable).
 
 *-D* 'flavor', *--defaults* 'flavor'::
-  Use default settings suitable for a particular flavor of Debian: either debian or ubuntu.
+  Use default settings suitable for a particular flavor of Debian: either debian or ubuntu. The default is debian.
 
 *--do-not-verify-signatures*::
   Do not verify signatures from the Release files when running debootstrap.
diff --git a/piuparts.py b/piuparts.py
index 2b8e439..a1a88d0 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -122,7 +122,6 @@ class DefaultsFactory:
     def new_defaults(self):
         if not settings.defaults:
             settings.defaults = self.guess_flavor()
-            print "Guessed:", settings.defaults
         if settings.defaults.lower() == "debian":
             return DebianDefaults()
         if settings.defaults.lower() == "ubuntu":

-- 
piuparts git repository