[rhel7-branch 7/7] Ignore Merge pull commits and turn down logging level

bcl installerbot-noreply at redhat.com
Thu May 28 23:36:22 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

Github uses 'Merge pull' at the start of the merge commit. And the
logging level wasn't being set on the right logger so it was more
verbose than it needed to be.

(cherry picked from commit 51abb4f5c9e5300ddb664b30c018051b07916a1e)
---
 scripts/makebumpver | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/makebumpver b/scripts/makebumpver
index 57f549f..427bfb8 100755
--- a/scripts/makebumpver
+++ b/scripts/makebumpver
@@ -24,7 +24,7 @@ import logging
 logging.basicConfig(level=logging.DEBUG)
 log = logging.getLogger("bugzilla")
 log.setLevel(logging.INFO)
-urllib_log = logging.getLogger("urllib3")
+urllib_log = logging.getLogger("requests.packages.urllib3")
 urllib_log.setLevel(logging.ERROR)
 
 import bugzilla
@@ -235,6 +235,7 @@ class MakeBumpVer:
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE).communicate()
         lines = filter(lambda x: x.find('l10n: ') != 41 and \
+                                 x.find('Merge pull') != 41 and \
                                  x.find('Merge commit') != 41 and \
                                  x.find('Merge branch') != 41,
                        proc[0].strip('\n').split('\n'))


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/6d60be92182a8226e606aae5c13488d105b3c567


More information about the anaconda-patches mailing list