summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2010-08-09 13:11:54 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2010-08-09 13:31:28 +0200
commit7e99293c31ac1ad127e0c59e0fa3788078db7813 (patch)
treeded26dd260816395233e7c6af4eaee65ddafbf8f
parenteb65d5d7b4846b249c38cf1f03496bf4103a4444 (diff)
downloadfedora-packager-7e99293c31ac1ad127e0c59e0fa3788078db7813.tar.gz
fedora-packager-7e99293c31ac1ad127e0c59e0fa3788078db7813.tar.xz
fedora-packager-7e99293c31ac1ad127e0c59e0fa3788078db7813.zip
Use proper Logger instead of print statements
-rwxr-xr-xsrc/pyfedpkg/initial_merge.py22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/pyfedpkg/initial_merge.py b/src/pyfedpkg/initial_merge.py
index 7f60aeb..6f774bc 100755
--- a/src/pyfedpkg/initial_merge.py
+++ b/src/pyfedpkg/initial_merge.py
@@ -29,6 +29,7 @@ import argparse
import sys
import os
import subprocess
+import logging
import git
import pyfedpkg
@@ -42,6 +43,9 @@ __all__ = [
]
+log = logging.getLogger("fedpkg")
+
+
def str_numsplit(s):
"""Helper function for properly ordering branch names
@@ -118,16 +122,17 @@ class Filter(object):
self.branch_list = []
def do_initial_merge(self, into, to_merge):
- print "#### Merging", [ x.localbranch for x in to_merge ], \
- "into", into.localbranch, "####"
+ log.info("#### Merging %s into %s ####",
+ [ x.localbranch for x in to_merge ], into.localbranch)
pyfedpkg.switch_branch(into.localbranch, self.repo.working_tree_dir)
- print "Merging", [ x.origbranch for x in to_merge], "into", into.localbranch
+ log.info("Merging %s into %s",
+ repr([ x.origbranch for x in to_merge]), repr(into.localbranch))
self.repo.git.merge('-m', 'Initial peudo merge for dist-git setup',
'-s', 'ours',
*[x.origbranch for x in to_merge])
for t in to_merge:
pyfedpkg.switch_branch(t.localbranch, self.repo.working_tree_dir)
- print "Merging", into.localbranch, "into", t.localbranch
+ log.info("Merging %s into %s", repr(into.localbranch), repr(t.localbranch))
self.repo.git.merge(into.localbranch)
pyfedpkg.switch_branch(into.localbranch, self.repo.working_tree_dir)
@@ -157,12 +162,13 @@ class Filter(object):
def handle_repo(repo):
- print "########", "initial-merge", repo.working_tree_dir, "########"
+ log.info("######## initial-merge %s ########" % repo.working_tree_dir)
_locals, remotes = pyfedpkg._list_branches(repo=repo)
aa = [ Branch(repo.git.rev_parse('%s^{tree}' % b), b) for b in remotes ]
aa.sort(cmp_Branch)
- print "Branches sorted by tree sha:"
- for x in aa: print " ", x
+ log.info("Branches sorted by tree sha:")
+ for x in aa:
+ log.info(" %s" % x)
n = 0
f = Filter(repo)
@@ -171,7 +177,7 @@ def handle_repo(repo):
n = n + 1
f.flush()
- print "########", "/initial-merge", repo.working_tree_dir, "########"
+ log.info("######## /initial-merge %s ########" % repo.working_tree_dir)
def handle_curdir():