need to be squashed in the output tree.)
"""
-import sys, re, os, argparse, ConfigParser, shutil
+import sys, re, os, argparse, shutil
+try:
+ import configparser as ConfigParser
+except:
+ import ConfigParser
# find self
source_dir = os.path.abspath(os.path.dirname(__file__))
})
msg = 'Failed to create backport\n\n%s%s: %s' % (PREFIX, FAIL, failure)
for l in log:
- print l
+ print(l)
newline=''
if prev_kernel_rev:
msg += '\n%s%s-last-success: %s' % (PREFIX, tree, prev_kernel_rev)
# check required parameters
trees = config.sections()
if not trees:
- print "No trees are defined, see git-tracker.ini.example!"
+ print("No trees are defined, see git-tracker.ini.example!")
sys.exit(3)
for tree in trees:
if not config.has_option(tree, 'input'):
- print "No input defined in section %s" % tree
+ print("No input defined in section %s" % tree)
sys.exit(3)
if not config.has_option(tree, 'output'):
- print "No output defined in section %s" % tree
+ print("No output defined in section %s" % tree)
sys.exit(3)
with tempdir.tempdir() as kernel_tmpdir:
catch_up_from_failure = False
commits = git.log_commits(prev, kernel_head, tree=kernelobjdir)
if len(commits) > MAX_COMMITS:
- print "too many commits (%d)!" % len(commits)
+ print("too many commits (%d)!" % len(commits))
sys.exit(10)
prev_commits = {}
p = prev
prev_commits[commit] = p
p = commit
for commit in commits:
- print 'updating to commit', commit
+ print('updating to commit %s' % commit)
env = git.commit_env_vars(commit, tree=kernelobjdir)
if prev_commits[commit] == prev:
# committing multiple commits
shortlog = git.shortlog(prev, '%s^2' % commit,
tree=kernelobjdir)
msg += "\nCommits in this merge:\n\n" + shortlog
- except git.ExecutionError, e:
+ except git.ExecutionError as e:
# will fail if it wasn't a merge commit
pass
else:
shutil.rmtree(d, ignore_errors=True)
try:
os.rmdir(d)
- except OSError, e:
+ except OSError as e:
if e.errno != errno.ENOENT:
raise
else:
try:
os.makedirs(os.path.join(outdir, os.path.dirname(tgtitem)))
- except OSError, e:
+ except OSError as e:
# ignore dirs we might have created just now
if e.errno != errno.EEXIST:
raise
bpi = kconfig.get_backport_info(os.path.join(args.outdir, 'compat', 'Kconfig'))
configtree = kconfig.ConfigTree(os.path.join(args.outdir, 'Kconfig'))
all_selects = configtree.all_selects()
- for sym, vals in bpi.iteritems():
+ for sym, vals in bpi.items():
if sym.startswith('BACKPORT_BUILD_'):
if not sym[15:] in all_selects:
continue
new = []
for dep in deplist[sym]:
if dep == "DISABLE":
- new.append('BACKPORT_DISABLED_KCONFIG_OPTION')
+ new.append('BACKPORT_DISABLED_KCONFIG_OPTION')
else:
new.append('!BACKPORT_KERNEL_%s' % dep.replace('.', '_'))
deplist[sym] = new
import copy
import logging
import re
-# cStringIO doesn't support unicode in 2.5
-from StringIO import StringIO
-import urllib2
+import sys
+
+try:
+ # cStringIO doesn't support unicode in 2.5
+ from StringIO import StringIO
+except ImportError:
+ # StringIO has been renamed to 'io' in 3.x
+ from io import StringIO
+
+try:
+ import urllib2
+except ImportError:
+ import urllib.request as urllib2
from os.path import exists, isfile, abspath
import os
import shutil
+_open = open
+
+if sys.version_info >= (3,):
+ # Open files with universal newline support but no newline translation (3.x)
+ def open(filename, mode='r'):
+ return _open(filename, mode, newline='')
+else:
+ # Open files with universal newline support but no newline translation (2.x)
+ def open(filename, mode='r'):
+ return _open(filename, mode + 'b')
+
+ # Python 3.x has changed iter.next() to be next(iter) instead, so for
+ # backwards compatibility, we'll just define a next() function under 2.x
+ def next(iter):
+ return iter.next()
+
+
#------------------------------------------------
# Logging is controlled by logger named after the
# module name (e.g. 'patch' for patch.py module)
"""
patchset = PatchSet()
debug("reading %s" % filename)
- fp = open(filename, "rb")
+ fp = open(filename, "r")
res = patchset.parse(fp)
fp.close()
if res == True:
hunkactual = dict(linessrc=None, linestgt=None)
- class wrapumerate(enumerate):
+ class wrapumerate(object):
"""Enumerate wrapper that uses boolean end of stream status instead of
StopIteration exception, and properties to access line information.
"""
- def __init__(self, *args, **kwargs):
- # we don't call parent, it is magically created by __new__ method
-
+ def __init__(self, stream):
self._exhausted = False
self._lineno = False # after end of stream equal to the num of lines
self._line = False # will be reset to False after end of stream
+ self._iter = enumerate(stream)
def next(self):
"""Try to read the next line and return True if it is available,
return False
try:
- self._lineno, self._line = super(wrapumerate, self).next()
+ self._lineno, self._line = next(self._iter)
except StopIteration:
self._exhausted = True
self._line = False
return False
return True
+ # python 3 uses __next__ consistent with next(iter)
+ __next__ = next
@property
def is_empty(self):
# start of main cycle
# each parsing block already has line available in fe.line
fe = wrapumerate(stream)
- while fe.next():
+ while next(fe):
# -- deciders: these only switch state to decide who should process
# -- line fetched at the start of this cycle
while not fe.is_empty and not fe.line.startswith("--- "):
header.append(fe.line)
self.top_header += fe.line
- fe.next()
+ next(fe)
if fe.is_empty:
if p == None:
debug("no patch data found") # error is shown later
nexthunkno += 1
continue
- # /while fe.next()
+ # /while next(fe)
if p:
self.items.append(p)
def write_hunks(self, srcname, tgtname, hunks):
- src = open(srcname, "rb")
- tgt = open(tgtname, "wb")
+ src = open(srcname, "r")
+ tgt = open(tgtname, "w")
debug("processing target file %s" % tgtname)
patch = fromfile(patchfile)
if options.diffstat:
- print patch.diffstat()
+ print(patch.diffstat())
sys.exit(0)
#pprint(patch)
def __exit__(self, type, value, traceback):
if self.nodelete:
- print 'not deleting directory %s!' % self._name
+ print('not deleting directory %s!' % self._name)
else:
shutil.rmtree(self._name)
projects / openwrt / staging / blogic.git / commitdiff