MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

layerindex,rrs: Minor changes to work with python3.

Browse Source 
[YOCTO #9746]

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
This commit is contained in:
Aníbal Limón 2016-06-29 15:08:34 -05:00
parent b274a65f65
commit 931297fb58
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layerindex/utils.py
View File

@ -48,7 +48,7 @@ def runcmd(cmd, destdir=None, printerr=True, logger=None):
raise e raise e
out.seek(0) out.seek(0)
output = out.read() output = out.read().decode("utf-8")
#logger.debug("output: %s" % output.rstrip() ) #logger.debug("output: %s" % output.rstrip() )
return output return output

8
rrs/tools/common.py
View File

@ -5,13 +5,15 @@
# #
# Licensed under the MIT license, see COPYING.MIT for details # Licensed under the MIT license, see COPYING.MIT for details
import logging
def common_setup(): def common_setup():
import sys, os import sys, os
sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), '../../'))) sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), '../../')))
def get_logger(name, settings): def get_logger(name, settings):
import logging
import os import os
from logging.handlers import RotatingFileHandler
logger = logging.getLogger(name) logger = logging.getLogger(name)
formatter = logging.Formatter("%(asctime)s: %(levelname)s: %(message)s") formatter = logging.Formatter("%(asctime)s: %(levelname)s: %(message)s")
@ -22,8 +24,8 @@ def get_logger(name, settings):
filename = os.path.join(settings.TOOLS_LOG_DIR, name) filename = os.path.join(settings.TOOLS_LOG_DIR, name)
maxBytes = 8388608 # 8MB maxBytes = 8388608 # 8MB
handler = logging.handlers.RotatingFileHandler(filename, handler = RotatingFileHandler(filename, maxBytes=maxBytes)
maxBytes=maxBytes)
handler.setFormatter(formatter) handler.setFormatter(formatter)
logger.addHandler(handler) logger.addHandler(handler)

2
rrs/tools/rrs_distros.py
View File

@ -122,7 +122,7 @@ if __name__=="__main__":
continue continue
distro_info = search_package_in_distros(pkglst_dir, recipe, recipe_data) distro_info = search_package_in_distros(pkglst_dir, recipe, recipe_data)
for distro, alias in distro_info.iteritems(): for distro, alias in distro_info.items():
recipedistro = RecipeDistro() recipedistro = RecipeDistro()
recipedistro.recipe = recipe recipedistro.recipe = recipe
recipedistro.distro = distro recipedistro.distro = distro