diff -Nru osc-0.162.2-tizen20180912/debian/changelog osc-0.168.2-tizen20180912/debian/changelog --- osc-0.162.2-tizen20180912/debian/changelog 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/debian/changelog 2020-06-12 08:17:24.000000000 +0000 @@ -1,8 +1,13 @@ -osc (0.162.2-tizen20180912-0ubuntu0~ubuntu18.04.1) bionic; urgency=low +osc (0.168.2-tizen20180912-0ubuntu0~ubuntu18.04.1) bionic; urgency=low * Auto build. - -- Launchpad Package Builder Thu, 21 Feb 2019 04:31:15 +0000 + -- Launchpad Package Builder Fri, 12 Jun 2020 08:17:24 +0000 + +osc (0.168.2-tizen20180912) unstable; urgency=low + - Upgrade version to 0.168.2 to adapt Ubuntu_20.04 + + -- Biao Wang Fri, 22 May 2020 19:30:00 +0200 osc (0.162.2-tizen20180912) unstable; urgency=low - Upgrade version to 0.162.2 to adapt Ubuntu_18.04 diff -Nru osc-0.162.2-tizen20180912/debian/control osc-0.168.2-tizen20180912/debian/control --- osc-0.162.2-tizen20180912/debian/control 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/debian/control 2020-06-12 08:17:24.000000000 +0000 @@ -2,14 +2,14 @@ Section: devel Priority: extra Maintainer: Adrian Schroeter -Build-Depends: debhelper (>= 4.0.0), dpatch, python-urlgrabber +Build-Depends: debhelper (>= 4.0.0), dpatch, python, python-dev, python-urlgrabber Standards-Version: 3.8.3 Homepage: http://en.opensuse.org/Build_Service/CLI Package: osc Section: devel Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>= 2.5), python-urlgrabber, python-rpm, python-m2crypto (>= 0.20) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>= 2.5), python-urlgrabber, python-rpm, python-keyring, python-gobject, python-m2crypto (>= 0.20) | python3-m2crypto Suggests: python-gnomekeyring, gnome-keyring, build (> 2010.04.24) Description: openSUSE (buildsystem) commander Commandline client for the openSUSE Build Service, which allows to access diff -Nru osc-0.162.2-tizen20180912/debian/git-build-recipe.manifest osc-0.168.2-tizen20180912/debian/git-build-recipe.manifest --- osc-0.162.2-tizen20180912/debian/git-build-recipe.manifest 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/debian/git-build-recipe.manifest 2020-06-12 08:17:24.000000000 +0000 @@ -1,2 +1,2 @@ # git-build-recipe format 0.4 deb-version {debversion}-0ubuntu0 -lp:osc git-commit:1d927fd8c5ad9a933438e7bb15c0af5d9ff72344 +lp:osc git-commit:e1c33aa026e881af40d252306ff1c2134b55e76c diff -Nru osc-0.162.2-tizen20180912/debian/rules osc-0.168.2-tizen20180912/debian/rules --- osc-0.162.2-tizen20180912/debian/rules 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/debian/rules 2020-06-12 08:17:24.000000000 +0000 @@ -7,6 +7,7 @@ build-stamp: dh_testdir touch build-stamp + python setup.py build --force override_dh_installchangelogs: dh_installchangelogs NEWS diff -Nru osc-0.162.2-tizen20180912/osc/babysitter.py osc-0.168.2-tizen20180912/osc/babysitter.py --- osc-0.162.2-tizen20180912/osc/babysitter.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/osc/babysitter.py 2020-06-12 08:17:24.000000000 +0000 @@ -27,7 +27,7 @@ try: # import as RPMError because the class "error" is too generic - from rpm import error as RPMError + from rpm import error as RPMError #pylint: disable=no-name-in-module except: # if rpm-python isn't installed (we might be on a debian system): RPMError = None diff -Nru osc-0.162.2-tizen20180912/osc/build.py osc-0.168.2-tizen20180912/osc/build.py --- osc-0.162.2-tizen20180912/osc/build.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/osc/build.py 2020-06-12 08:17:24.000000000 +0000 @@ -319,7 +319,7 @@ return repositoryDirectory -def get_prefer_pkgs(dirs, wanted_arch, type, cpio): +def get_prefer_pkgs(dirs, wanted_arch, type, cpio=None): import glob from .util import repodata, packagequery paths = [] @@ -813,7 +813,7 @@ self._rmtree(self.name) def __del__(self): self.cleanup() - def __exit__(self): + def __exit__(self, type=None, value=None, trace=None): self.cleanup() def __str__(self): return self.name diff -Nru osc-0.162.2-tizen20180912/osc/cmdln.py osc-0.168.2-tizen20180912/osc/cmdln.py --- osc-0.162.2-tizen20180912/osc/cmdln.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/osc/cmdln.py 2020-06-12 08:17:24.000000000 +0000 @@ -891,7 +891,7 @@ warnings.warn("argument '**%s' on '%s.%s' command " "handler will never get values" % (name, self.__class__.__name__, - getattr(func, "__name__", getattr(func, "func_name")))) + getattr(func_defaults, "__name__", getattr(func_defaults, "func_name")))) if co_flags & CO_FLAGS_ARGS: name = argnames.pop(-1) tail = "[%s...]" % name.upper() diff -Nru osc-0.162.2-tizen20180912/osc/commandline.py osc-0.168.2-tizen20180912/osc/commandline.py --- osc-0.162.2-tizen20180912/osc/commandline.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/osc/commandline.py 2020-06-12 08:17:24.000000000 +0000 @@ -1152,7 +1152,7 @@ raise oscerr.UserAbort() elif len(args) >= 3: # get the arguments from the commandline - src_project, src_package, dst_project = args[0:3] + src_project, src_package, dst_project = args[0:3] #pylint: disable=unbalanced-tuple-unpacking if len(args) == 4: dst_package = args[3] else: @@ -2779,6 +2779,7 @@ raise oscerr.WrongArgs('Too many arguments.') if len(args) == 0: + wd = os.curdir if is_project_dir(os.curdir): source_project = store_read_project(os.curdir) elif is_package_dir(os.curdir): @@ -7538,7 +7539,7 @@ opts.headers = None opts.data = None opts.file = None - return self.do_api('list', opts, *args) + return self.do_api('list', opts, *args) #pylint: disable=no-value-for-parameter diff -Nru osc-0.162.2-tizen20180912/osc/conf.py osc-0.168.2-tizen20180912/osc/conf.py --- osc-0.162.2-tizen20180912/osc/conf.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/osc/conf.py 2020-06-12 08:17:24.000000000 +0000 @@ -73,7 +73,7 @@ try: import gobject gobject.set_application_name('osc') - import gnomekeyring + import gnomekeyring #pylint: disable=import-error if os.environ['GNOME_DESKTOP_SESSION_ID']: # otherwise gnome keyring bindings spit out errors, when you have # it installed, but you are not under gnome @@ -443,7 +443,7 @@ # cafile/capath locations) def _build_opener(url): from osc.core import __version__ - global config + apiurl = urljoin(*parse_apisrv_url(None, url)) if 'last_opener' not in _build_opener.__dict__: _build_opener.last_opener = (None, None) @@ -733,7 +733,7 @@ """ Add a section to config file for new api url. """ - global config + cp = get_configParser(filename) try: cp.add_section(url) diff -Nru osc-0.162.2-tizen20180912/osc/core.py osc-0.168.2-tizen20180912/osc/core.py --- osc-0.162.2-tizen20180912/osc/core.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/osc/core.py 2020-06-12 08:17:24.000000000 +0000 @@ -5,7 +5,7 @@ from __future__ import print_function -__version__ = '0.162' +__version__ = '0.168' # __store_version__ is to be incremented when the format of the working copy # "store" changes in an incompatible way. Please add any needed migration @@ -644,7 +644,6 @@ self.pacs_missing = [ i for i in self.pacs_available if i not in self.pacs_have ] def wc_check(self): - global store dirty_files = [] req_storefiles = Project.REQ_STOREFILES if conf.config['do_package_tracking']: @@ -655,7 +654,6 @@ return dirty_files def wc_repair(self, apiurl=None): - global store if not os.path.exists(os.path.join(self.dir, store, '_apiurl')) or apiurl: if apiurl is None: msg = 'cannot repair wc: the \'_apiurl\' file is missing but ' \ @@ -746,7 +744,7 @@ Returns an ``xml.etree.cElementTree`` object representing the parsed contents of the project's ``.osc/_packages`` XML file. """ - global store + packages_file = os.path.join(self.absdir, store, '_packages') if os.path.isfile(packages_file) and os.path.getsize(packages_file): @@ -1038,7 +1036,6 @@ @staticmethod def init_project(apiurl, dir, project, package_tracking=True, getPackageList=True, progress_obj=None, wc_check=True): - global store if not os.path.exists(dir): # use makedirs (checkout_no_colon config option might be enabled) @@ -1067,7 +1064,6 @@ '_size_limit', '_commit_msg') def __init__(self, workingdir, progress_obj=None, size_limit=None, wc_check=True): - global store self.dir = workingdir self.absdir = os.path.abspath(self.dir) @@ -1754,7 +1750,6 @@ return i def get_status(self, excluded=False, *exclude_states): - global store todo = self.todo if not todo: todo = self.filenamelist + self.to_be_added + \ @@ -2324,7 +2319,6 @@ @staticmethod def init_package(apiurl, project, package, dir, size_limit=None, meta=False, progress_obj=None): - global store if not os.path.exists(dir): os.mkdir(dir) @@ -2917,15 +2911,11 @@ def is_project_dir(d): - global store - return os.path.exists(os.path.join(d, store, '_project')) and not \ os.path.exists(os.path.join(d, store, '_package')) def is_package_dir(d): - global store - return os.path.exists(os.path.join(d, store, '_project')) and \ os.path.exists(os.path.join(d, store, '_package')) @@ -2933,9 +2923,6 @@ """Parse a disturl, returns tuple (apiurl, project, source, repository, revision), else raises an oscerr.WrongArgs exception """ - - global DISTURL_RE - m = DISTURL_RE.match(disturl) if not m: raise oscerr.WrongArgs("`%s' does not look like disturl" % disturl) @@ -2949,8 +2936,6 @@ """Parse a build log url, returns a tuple (apiurl, project, package, repository, arch), else raises oscerr.WrongArgs exception""" - global BUILDLOGURL_RE - m = BUILDLOGURL_RE.match(buildlogurl) if not m: raise oscerr.WrongArgs('\'%s\' does not look like url with a build log' % buildlogurl) @@ -3052,7 +3037,6 @@ def read_filemeta(dir): - global store msg = '\'%s\' is not a valid working copy.' % dir filesmeta = os.path.join(dir, store, '_files') @@ -3068,7 +3052,6 @@ return r def store_readlist(dir, name): - global store r = [] if os.path.exists(os.path.join(dir, store, name)): @@ -3082,7 +3065,6 @@ return store_readlist(dir, '_to_be_deleted') def read_sizelimit(dir): - global store r = None fname = os.path.join(dir, store, '_size_limit') @@ -3228,7 +3210,6 @@ def check_store_version(dir): - global store versionfile = os.path.join(dir, store, '_osclib_version') try: @@ -3541,8 +3522,6 @@ create_new=True, apiurl=None): - global metatypes - if not apiurl: apiurl = conf.config['apiurl'] url = make_meta_url(metatype, path_args, apiurl) @@ -3559,8 +3538,6 @@ return data def make_meta_url(metatype, path_args=None, apiurl=None, force=False, remove_linking_repositories=False): - global metatypes - if not apiurl: apiurl = conf.config['apiurl'] if metatype not in metatypes.keys(): @@ -3589,8 +3566,6 @@ change_is_required=False, apiurl=None): - global metatypes - if not apiurl: apiurl = conf.config['apiurl'] if not data: @@ -4320,7 +4295,6 @@ def download(url, filename, progress_obj = None, mtime = None): import tempfile, shutil - global BUFSIZE o = None try: @@ -4388,8 +4362,6 @@ #if not os.path.exists(file): #return None - global BUFSIZE - try: import hashlib md5 = hashlib @@ -4403,7 +4375,7 @@ if not buf: break s.update(buf) return s.hexdigest() - f.close() + # f.close() def binary(s): @@ -4428,8 +4400,6 @@ import difflib - global store - if not oldfilename: oldfilename = filename @@ -5272,7 +5242,7 @@ return r -def show_results_meta(apiurl, prj, package=None, lastbuild=None, repository=[], arch=[], oldstate=None): +def show_results_meta(apiurl=None, prj=None, package=None, lastbuild=None, repository=[], arch=[], oldstate=None): query = {} if package: query['package'] = package @@ -5295,7 +5265,7 @@ return f.readlines() -def get_package_results(apiurl, prj, package, lastbuild=None, repository=[], arch=[], oldstate=None): +def get_package_results(apiurl=None, prj=None, package=None, lastbuild=None, repository=[], arch=[], oldstate=None): """ return a package results as a list of dicts """ r = [] @@ -5335,7 +5305,7 @@ """apply selected format on each dict in results and return it as a list of strings""" return [format % r for r in results] -def get_results(apiurl, prj, package, lastbuild=None, repository=[], arch=[], verbose=False, wait=False, printJoin=None): +def get_results(apiurl=None, prj=None, package=None, lastbuild=None, repository=[], arch=[], verbose=False, wait=False, printJoin=None): r = [] result_line_templ = '%(rep)-20s %(arch)-10s %(status)s' oldstate = None @@ -5390,7 +5360,6 @@ def get_prj_results(apiurl, prj, hide_legend=False, csv=False, status_filter=None, name_filter=None, arch=None, repo=None, vertical=None, show_excluded=None): #print '----------------------------------------' - global buildstatus_symbols r = [] @@ -5917,8 +5886,6 @@ def store_read_project(dir): - global store - try: p = open(os.path.join(dir, store, '_project')).readlines()[0].strip() except IOError: @@ -5930,8 +5897,6 @@ def store_read_package(dir): - global store - try: p = open(os.path.join(dir, store, '_package')).readlines()[0].strip() except IOError: @@ -5942,8 +5907,6 @@ return p def store_read_apiurl(dir, defaulturl=True): - global store - fname = os.path.join(dir, store, '_apiurl') try: url = open(fname).readlines()[0].strip() @@ -5970,8 +5933,6 @@ return apiurl def store_write_string(dir, file, string, subdir=''): - global store - if subdir and not os.path.isdir(os.path.join(dir, store, subdir)): os.mkdir(os.path.join(dir, store, subdir)) fname = os.path.join(dir, store, subdir, file) @@ -5992,14 +5953,10 @@ store_write_string(dir, '_apiurl', apiurl + '\n') def store_unlink_file(dir, file): - global store - try: os.unlink(os.path.join(dir, store, file)) except: pass def store_read_file(dir, file): - global store - try: content = open(os.path.join(dir, store, file)).read() return content @@ -6007,8 +5964,6 @@ return None def store_write_initial_packages(dir, project, subelements): - global store - fname = os.path.join(dir, store, '_packages') root = ET.Element('project', name=project) for elem in subelements: @@ -6480,7 +6435,7 @@ """ prj_dir, pac_dir = getPrjPacPaths(pathname) if is_project_dir(prj_dir): - global store + if not os.path.exists(pac_dir+store): prj = prj_obj or Project(prj_dir, False) Package.init_package(prj.apiurl, prj.name, pac_dir, pac_dir) diff -Nru osc-0.162.2-tizen20180912/osc/__init__.py osc-0.168.2-tizen20180912/osc/__init__.py --- osc-0.162.2-tizen20180912/osc/__init__.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/osc/__init__.py 2020-06-12 08:17:24.000000000 +0000 @@ -1,3 +1,3 @@ -__all__ = ['babysitter', 'core', 'commandline', 'oscerr', 'othermethods', 'build', 'fetch', 'meter'] +__all__ = ['babysitter', 'core', 'commandline', 'oscerr', 'build', 'fetch', 'meter'] # vim: sw=4 et diff -Nru osc-0.162.2-tizen20180912/osc/oscerr.py osc-0.168.2-tizen20180912/osc/oscerr.py --- osc-0.162.2-tizen20180912/osc/oscerr.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/osc/oscerr.py 2020-06-12 08:17:24.000000000 +0000 @@ -147,7 +147,7 @@ self.msg = msg class PackageInternalError(PackageError): - def __init__(self, prj, pac, msg): + def __init__(self, prj, pac=None, msg=None): PackageError.__init__(self, prj, pac) self.msg = msg # vim: sw=4 et diff -Nru osc-0.162.2-tizen20180912/osc/util/ar.py osc-0.168.2-tizen20180912/osc/util/ar.py --- osc-0.162.2-tizen20180912/osc/util/ar.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/osc/util/ar.py 2020-06-12 08:17:24.000000000 +0000 @@ -101,7 +101,7 @@ def __init__(self, fn = None, fh = None): if fn == None and fh == None: - raise ArError('either \'fn\' or \'fh\' must be != None') + raise ArError(fn,'either \'fn\' or \'fh\' must be != None') if fh != None: self.__file = fh self.__closefile = False diff -Nru osc-0.162.2-tizen20180912/packaging/osc.spec osc-0.168.2-tizen20180912/packaging/osc.spec --- osc-0.162.2-tizen20180912/packaging/osc.spec 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/packaging/osc.spec 2020-06-12 08:17:24.000000000 +0000 @@ -2,7 +2,7 @@ Name: osc Summary: OpenSUSE Build Service Commander -Version: 0.162.2 +Version: 0.168.2 Release: tizen20180912 Group: Development/Tools/Other License: GPL v2 or later @@ -13,6 +13,9 @@ BuildRequires: python-devel BuildRequires: python-urlgrabber Requires: python-urlgrabber +Requires: python-keyring +Requires: python-gobject +Requires: python-rpm %if 0%{?suse_version} || "0%{?tizen_version}" != "0" BuildRequires: python-m2crypto @@ -76,6 +79,8 @@ %doc AUTHORS README TODO NEWS %doc %_mandir/man1/osc.* %changelog +* Fri May 22 2020 biao716.wang@samsung.com +- Upgrade version to 0.168.2 to adapt Ubuntu_20.04 * Fri Sep 14 2018 biao716.wang@samsung.com - Upgrade version to 0.162.2 to adapt Ubuntu_18.04 * Sat Dec 31 2016 sk7.park@samsung.com diff -Nru osc-0.162.2-tizen20180912/setup.py osc-0.168.2-tizen20180912/setup.py --- osc-0.162.2-tizen20180912/setup.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/setup.py 2020-06-12 08:17:24.000000000 +0000 @@ -10,7 +10,7 @@ from osc import babysitter # optional support for py2exe try: - import py2exe + import py2exe #pylint: disable=import-error HAVE_PY2EXE = True except: HAVE_PY2EXE = False diff -Nru osc-0.162.2-tizen20180912/tests/common.py osc-0.168.2-tizen20180912/tests/common.py --- osc-0.162.2-tizen20180912/tests/common.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/tests/common.py 2020-06-12 08:17:24.000000000 +0000 @@ -17,8 +17,8 @@ from urlparse import urlparse, parse_qs except ImportError: from io import StringIO - from urllib.request import HTTPHandler, addinfourl, build_opener - from urllib.parse import urlparse, parse_qs + from urllib.request import HTTPHandler, addinfourl, build_opener #pylint: disable=no-name-in-module,import-error + from urllib.parse import urlparse, parse_qs #pylint: disable=no-name-in-module,import-error def urlcompare(url, *args): """compare all components of url except query string - it is converted to @@ -135,7 +135,7 @@ return urldecorator('DELETE', fullurl, **kwargs) def addExpectedRequest(method, url, **kwargs): - global EXPECTED_REQUESTS + EXPECTED_REQUESTS.append((method, url, kwargs)) class OscTestCase(unittest.TestCase): diff -Nru osc-0.162.2-tizen20180912/tests/osc/babysitter.py osc-0.168.2-tizen20180912/tests/osc/babysitter.py --- osc-0.162.2-tizen20180912/tests/osc/babysitter.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/tests/osc/babysitter.py 2020-06-12 08:17:24.000000000 +0000 @@ -27,7 +27,7 @@ try: # import as RPMError because the class "error" is too generic - from rpm import error as RPMError + from rpm import error as RPMError #pylint: disable=no-name-in-module except: # if rpm-python isn't installed (we might be on a debian system): RPMError = None diff -Nru osc-0.162.2-tizen20180912/tests/osc/build.py osc-0.168.2-tizen20180912/tests/osc/build.py --- osc-0.162.2-tizen20180912/tests/osc/build.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/tests/osc/build.py 2020-06-12 08:17:24.000000000 +0000 @@ -319,7 +319,7 @@ return repositoryDirectory -def get_prefer_pkgs(dirs, wanted_arch, type, cpio): +def get_prefer_pkgs(dirs, wanted_arch, type, cpio=None): import glob from .util import repodata, packagequery paths = [] @@ -813,7 +813,7 @@ self._rmtree(self.name) def __del__(self): self.cleanup() - def __exit__(self): + def __exit__(self, type=None, value=None, trace=None): self.cleanup() def __str__(self): return self.name diff -Nru osc-0.162.2-tizen20180912/tests/osc/cmdln.py osc-0.168.2-tizen20180912/tests/osc/cmdln.py --- osc-0.162.2-tizen20180912/tests/osc/cmdln.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/tests/osc/cmdln.py 2020-06-12 08:17:24.000000000 +0000 @@ -891,7 +891,7 @@ warnings.warn("argument '**%s' on '%s.%s' command " "handler will never get values" % (name, self.__class__.__name__, - getattr(func, "__name__", getattr(func, "func_name")))) + getattr(func_defaults, "__name__", getattr(func_defaults, "func_name")))) if co_flags & CO_FLAGS_ARGS: name = argnames.pop(-1) tail = "[%s...]" % name.upper() diff -Nru osc-0.162.2-tizen20180912/tests/osc/commandline.py osc-0.168.2-tizen20180912/tests/osc/commandline.py --- osc-0.162.2-tizen20180912/tests/osc/commandline.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/tests/osc/commandline.py 2020-06-12 08:17:24.000000000 +0000 @@ -1152,7 +1152,7 @@ raise oscerr.UserAbort() elif len(args) >= 3: # get the arguments from the commandline - src_project, src_package, dst_project = args[0:3] + src_project, src_package, dst_project = args[0:3] #pylint: disable=unbalanced-tuple-unpacking if len(args) == 4: dst_package = args[3] else: @@ -2779,6 +2779,7 @@ raise oscerr.WrongArgs('Too many arguments.') if len(args) == 0: + wd = os.curdir if is_project_dir(os.curdir): source_project = store_read_project(os.curdir) elif is_package_dir(os.curdir): @@ -7538,7 +7539,7 @@ opts.headers = None opts.data = None opts.file = None - return self.do_api('list', opts, *args) + return self.do_api('list', opts, *args) #pylint: disable=no-value-for-parameter diff -Nru osc-0.162.2-tizen20180912/tests/osc/conf.py osc-0.168.2-tizen20180912/tests/osc/conf.py --- osc-0.162.2-tizen20180912/tests/osc/conf.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/tests/osc/conf.py 2020-06-12 08:17:24.000000000 +0000 @@ -73,7 +73,7 @@ try: import gobject gobject.set_application_name('osc') - import gnomekeyring + import gnomekeyring #pylint: disable=import-error if os.environ['GNOME_DESKTOP_SESSION_ID']: # otherwise gnome keyring bindings spit out errors, when you have # it installed, but you are not under gnome @@ -443,7 +443,7 @@ # cafile/capath locations) def _build_opener(url): from osc.core import __version__ - global config + apiurl = urljoin(*parse_apisrv_url(None, url)) if 'last_opener' not in _build_opener.__dict__: _build_opener.last_opener = (None, None) @@ -733,7 +733,7 @@ """ Add a section to config file for new api url. """ - global config + cp = get_configParser(filename) try: cp.add_section(url) diff -Nru osc-0.162.2-tizen20180912/tests/osc/core.py osc-0.168.2-tizen20180912/tests/osc/core.py --- osc-0.162.2-tizen20180912/tests/osc/core.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/tests/osc/core.py 2020-06-12 08:17:24.000000000 +0000 @@ -5,7 +5,7 @@ from __future__ import print_function -__version__ = '0.162' +__version__ = '0.168' # __store_version__ is to be incremented when the format of the working copy # "store" changes in an incompatible way. Please add any needed migration @@ -644,7 +644,6 @@ self.pacs_missing = [ i for i in self.pacs_available if i not in self.pacs_have ] def wc_check(self): - global store dirty_files = [] req_storefiles = Project.REQ_STOREFILES if conf.config['do_package_tracking']: @@ -655,7 +654,6 @@ return dirty_files def wc_repair(self, apiurl=None): - global store if not os.path.exists(os.path.join(self.dir, store, '_apiurl')) or apiurl: if apiurl is None: msg = 'cannot repair wc: the \'_apiurl\' file is missing but ' \ @@ -746,7 +744,7 @@ Returns an ``xml.etree.cElementTree`` object representing the parsed contents of the project's ``.osc/_packages`` XML file. """ - global store + packages_file = os.path.join(self.absdir, store, '_packages') if os.path.isfile(packages_file) and os.path.getsize(packages_file): @@ -1038,7 +1036,6 @@ @staticmethod def init_project(apiurl, dir, project, package_tracking=True, getPackageList=True, progress_obj=None, wc_check=True): - global store if not os.path.exists(dir): # use makedirs (checkout_no_colon config option might be enabled) @@ -1067,7 +1064,6 @@ '_size_limit', '_commit_msg') def __init__(self, workingdir, progress_obj=None, size_limit=None, wc_check=True): - global store self.dir = workingdir self.absdir = os.path.abspath(self.dir) @@ -1754,7 +1750,6 @@ return i def get_status(self, excluded=False, *exclude_states): - global store todo = self.todo if not todo: todo = self.filenamelist + self.to_be_added + \ @@ -2324,7 +2319,6 @@ @staticmethod def init_package(apiurl, project, package, dir, size_limit=None, meta=False, progress_obj=None): - global store if not os.path.exists(dir): os.mkdir(dir) @@ -2917,15 +2911,11 @@ def is_project_dir(d): - global store - return os.path.exists(os.path.join(d, store, '_project')) and not \ os.path.exists(os.path.join(d, store, '_package')) def is_package_dir(d): - global store - return os.path.exists(os.path.join(d, store, '_project')) and \ os.path.exists(os.path.join(d, store, '_package')) @@ -2933,9 +2923,6 @@ """Parse a disturl, returns tuple (apiurl, project, source, repository, revision), else raises an oscerr.WrongArgs exception """ - - global DISTURL_RE - m = DISTURL_RE.match(disturl) if not m: raise oscerr.WrongArgs("`%s' does not look like disturl" % disturl) @@ -2949,8 +2936,6 @@ """Parse a build log url, returns a tuple (apiurl, project, package, repository, arch), else raises oscerr.WrongArgs exception""" - global BUILDLOGURL_RE - m = BUILDLOGURL_RE.match(buildlogurl) if not m: raise oscerr.WrongArgs('\'%s\' does not look like url with a build log' % buildlogurl) @@ -3052,7 +3037,6 @@ def read_filemeta(dir): - global store msg = '\'%s\' is not a valid working copy.' % dir filesmeta = os.path.join(dir, store, '_files') @@ -3068,7 +3052,6 @@ return r def store_readlist(dir, name): - global store r = [] if os.path.exists(os.path.join(dir, store, name)): @@ -3082,7 +3065,6 @@ return store_readlist(dir, '_to_be_deleted') def read_sizelimit(dir): - global store r = None fname = os.path.join(dir, store, '_size_limit') @@ -3228,7 +3210,6 @@ def check_store_version(dir): - global store versionfile = os.path.join(dir, store, '_osclib_version') try: @@ -3541,8 +3522,6 @@ create_new=True, apiurl=None): - global metatypes - if not apiurl: apiurl = conf.config['apiurl'] url = make_meta_url(metatype, path_args, apiurl) @@ -3559,8 +3538,6 @@ return data def make_meta_url(metatype, path_args=None, apiurl=None, force=False, remove_linking_repositories=False): - global metatypes - if not apiurl: apiurl = conf.config['apiurl'] if metatype not in metatypes.keys(): @@ -3589,8 +3566,6 @@ change_is_required=False, apiurl=None): - global metatypes - if not apiurl: apiurl = conf.config['apiurl'] if not data: @@ -4320,7 +4295,6 @@ def download(url, filename, progress_obj = None, mtime = None): import tempfile, shutil - global BUFSIZE o = None try: @@ -4388,8 +4362,6 @@ #if not os.path.exists(file): #return None - global BUFSIZE - try: import hashlib md5 = hashlib @@ -4403,7 +4375,7 @@ if not buf: break s.update(buf) return s.hexdigest() - f.close() + # f.close() def binary(s): @@ -4428,8 +4400,6 @@ import difflib - global store - if not oldfilename: oldfilename = filename @@ -5272,7 +5242,7 @@ return r -def show_results_meta(apiurl, prj, package=None, lastbuild=None, repository=[], arch=[], oldstate=None): +def show_results_meta(apiurl=None, prj=None, package=None, lastbuild=None, repository=[], arch=[], oldstate=None): query = {} if package: query['package'] = package @@ -5295,7 +5265,7 @@ return f.readlines() -def get_package_results(apiurl, prj, package, lastbuild=None, repository=[], arch=[], oldstate=None): +def get_package_results(apiurl=None, prj=None, package=None, lastbuild=None, repository=[], arch=[], oldstate=None): """ return a package results as a list of dicts """ r = [] @@ -5335,7 +5305,7 @@ """apply selected format on each dict in results and return it as a list of strings""" return [format % r for r in results] -def get_results(apiurl, prj, package, lastbuild=None, repository=[], arch=[], verbose=False, wait=False, printJoin=None): +def get_results(apiurl=None, prj=None, package=None, lastbuild=None, repository=[], arch=[], verbose=False, wait=False, printJoin=None): r = [] result_line_templ = '%(rep)-20s %(arch)-10s %(status)s' oldstate = None @@ -5390,7 +5360,6 @@ def get_prj_results(apiurl, prj, hide_legend=False, csv=False, status_filter=None, name_filter=None, arch=None, repo=None, vertical=None, show_excluded=None): #print '----------------------------------------' - global buildstatus_symbols r = [] @@ -5917,8 +5886,6 @@ def store_read_project(dir): - global store - try: p = open(os.path.join(dir, store, '_project')).readlines()[0].strip() except IOError: @@ -5930,8 +5897,6 @@ def store_read_package(dir): - global store - try: p = open(os.path.join(dir, store, '_package')).readlines()[0].strip() except IOError: @@ -5942,8 +5907,6 @@ return p def store_read_apiurl(dir, defaulturl=True): - global store - fname = os.path.join(dir, store, '_apiurl') try: url = open(fname).readlines()[0].strip() @@ -5970,8 +5933,6 @@ return apiurl def store_write_string(dir, file, string, subdir=''): - global store - if subdir and not os.path.isdir(os.path.join(dir, store, subdir)): os.mkdir(os.path.join(dir, store, subdir)) fname = os.path.join(dir, store, subdir, file) @@ -5992,14 +5953,10 @@ store_write_string(dir, '_apiurl', apiurl + '\n') def store_unlink_file(dir, file): - global store - try: os.unlink(os.path.join(dir, store, file)) except: pass def store_read_file(dir, file): - global store - try: content = open(os.path.join(dir, store, file)).read() return content @@ -6007,8 +5964,6 @@ return None def store_write_initial_packages(dir, project, subelements): - global store - fname = os.path.join(dir, store, '_packages') root = ET.Element('project', name=project) for elem in subelements: @@ -6480,7 +6435,7 @@ """ prj_dir, pac_dir = getPrjPacPaths(pathname) if is_project_dir(prj_dir): - global store + if not os.path.exists(pac_dir+store): prj = prj_obj or Project(prj_dir, False) Package.init_package(prj.apiurl, prj.name, pac_dir, pac_dir) diff -Nru osc-0.162.2-tizen20180912/tests/osc/__init__.py osc-0.168.2-tizen20180912/tests/osc/__init__.py --- osc-0.162.2-tizen20180912/tests/osc/__init__.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/tests/osc/__init__.py 2020-06-12 08:17:24.000000000 +0000 @@ -1,3 +1,3 @@ -__all__ = ['babysitter', 'core', 'commandline', 'oscerr', 'othermethods', 'build', 'fetch', 'meter'] +__all__ = ['babysitter', 'core', 'commandline', 'oscerr', 'build', 'fetch', 'meter'] # vim: sw=4 et diff -Nru osc-0.162.2-tizen20180912/tests/osc/oscerr.py osc-0.168.2-tizen20180912/tests/osc/oscerr.py --- osc-0.162.2-tizen20180912/tests/osc/oscerr.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/tests/osc/oscerr.py 2020-06-12 08:17:24.000000000 +0000 @@ -147,7 +147,7 @@ self.msg = msg class PackageInternalError(PackageError): - def __init__(self, prj, pac, msg): + def __init__(self, prj, pac=None, msg=None): PackageError.__init__(self, prj, pac) self.msg = msg # vim: sw=4 et diff -Nru osc-0.162.2-tizen20180912/tests/osc/util/ar.py osc-0.168.2-tizen20180912/tests/osc/util/ar.py --- osc-0.162.2-tizen20180912/tests/osc/util/ar.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/tests/osc/util/ar.py 2020-06-12 08:17:24.000000000 +0000 @@ -101,7 +101,7 @@ def __init__(self, fn = None, fh = None): if fn == None and fh == None: - raise ArError('either \'fn\' or \'fh\' must be != None') + raise ArError(fn,'either \'fn\' or \'fh\' must be != None') if fh != None: self.__file = fh self.__closefile = False diff -Nru osc-0.162.2-tizen20180912/tests/test_setlinkrev.py osc-0.168.2-tizen20180912/tests/test_setlinkrev.py --- osc-0.162.2-tizen20180912/tests/test_setlinkrev.py 2019-02-21 04:31:15.000000000 +0000 +++ osc-0.168.2-tizen20180912/tests/test_setlinkrev.py 2020-06-12 08:17:24.000000000 +0000 @@ -78,7 +78,7 @@ @GET('http://localhost/source/osctest/simple/_link', file='md5_rev_link') @PUT('http://localhost/source/osctest/simple/_link', exp='', text='dummytext') - def test_deleterev(self): + def test_deleterev1(self): """delete rev and vrev attribute from link xml""" osc.core.set_link_rev('http://localhost', 'osctest', 'simple', revision=None)