Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2019-09-26 20:40:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-release-tools" Thu Sep 26 20:40:33 2019 rev:222 rq:733088 version:20190924.e9a2774a Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2019-09-25 08:29:21.566376833 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.2352/openSUSE-release-tools.changes 2019-09-26 20:40:39.094635869 +0200 @@ -1,0 +2,22 @@ +Tue Sep 24 21:19:13 UTC 2019 - opensuse-releaseteam@opensuse.org + +- Update to version 20190924.e9a2774a: + * origin-manager: skip package of type not (None or source). + * check_source: decline package of kind not (meta or source). + * check_source: replace meta check with package_kind() == meta. + * osclib/core: package_kind(): include underscore as meta prefix. + +------------------------------------------------------------------- +Tue Sep 24 17:03:21 UTC 2019 - opensuse-releaseteam@opensuse.org + +- Update to version 20190924.faf6a82e: + * origin-manager: drop sub-classed CommandLineInterface as parent will suffice. + +------------------------------------------------------------------- +Tue Sep 24 15:04:36 UTC 2019 - opensuse-releaseteam@opensuse.org + +- Update to version 20190924.96ca2080: + * osclib/stagingapi: rebuild_check(): utilize -4096 offset for build log. + * osclib/stagingapi: buildlog_get(): support negative offset. + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20190923.83f1d51c.obscpio New: ---- openSUSE-release-tools-20190924.e9a2774a.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.VN94AH/_old 2019-09-26 20:40:41.298629980 +0200 +++ /var/tmp/diff_new_pack.VN94AH/_new 2019-09-26 20:40:41.302629969 +0200 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20190923.83f1d51c +Version: 20190924.e9a2774a Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0-or-later AND MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.VN94AH/_old 2019-09-26 20:40:41.346629851 +0200 +++ /var/tmp/diff_new_pack.VN94AH/_new 2019-09-26 20:40:41.346629851 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">83f1d51c3b67e42f7d5d253bbea42273525838e2</param> + <param name="changesrevision">e9a2774a4530d223cb7f3a6b2a90edcb10cd7e85</param> </service> </servicedata> ++++++ openSUSE-release-tools-20190923.83f1d51c.obscpio -> openSUSE-release-tools-20190924.e9a2774a.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190923.83f1d51c/check_source.py new/openSUSE-release-tools-20190924.e9a2774a/check_source.py --- old/openSUSE-release-tools-20190923.83f1d51c/check_source.py 2019-09-24 01:45:31.000000000 +0200 +++ new/openSUSE-release-tools-20190924.e9a2774a/check_source.py 2019-09-24 23:18:23.000000000 +0200 @@ -18,6 +18,7 @@ from osclib.core import devel_project_get from osclib.core import devel_project_fallback from osclib.core import group_members +from osclib.core import package_kind from osclib.core import source_file_load from osclib.core import target_archs from urllib.error import HTTPError @@ -77,9 +78,13 @@ self.review_messages['declined'] = 'Only one action per request allowed' return False - if target_package.startswith('00') or target_package.startswith('_'): - self.review_messages['accepted'] = 'Skipping all checks for product related packages' + kind = package_kind(self.apiurl, target_project, target_package) + if kind == 'meta': + self.review_messages['accepted'] = 'Skipping all checks for meta packages' return True + elif kind != 'source': + self.review_messages['accepted'] = 'May not modify a non-source package of type {}'.format(kind) + return False inair_renamed = target_package != source_package diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190923.83f1d51c/origin-manager.py new/openSUSE-release-tools-20190924.e9a2774a/origin-manager.py --- old/openSUSE-release-tools-20190923.83f1d51c/origin-manager.py 2019-09-24 01:45:31.000000000 +0200 +++ new/openSUSE-release-tools-20190924.e9a2774a/origin-manager.py 2019-09-24 23:18:23.000000000 +0200 @@ -1,6 +1,7 @@ #!/usr/bin/python3 from osclib.core import package_source_hash +from osclib.core import package_kind from osclib.origin import origin_annotation_dump from osclib.origin import config_load from osclib.origin import origin_find @@ -31,6 +32,11 @@ return True def check_source_submission(self, src_project, src_package, src_rev, tgt_project, tgt_package): + kind = package_kind(self.apiurl, tgt_project, tgt_package) + if not (kind is None or kind == 'source'): + self.review_messages['accepted'] = 'skipping {} package since not source'.format(kind) + return True + advance, result = self.config_validate(tgt_project) if not advance: return result @@ -114,11 +120,7 @@ only_replace=only_replace, bot_name_suffix=suffix) -class CommandLineInterface(ReviewBot.CommandLineInterface): - def __init__(self, *args, **kwargs): - ReviewBot.CommandLineInterface.__init__(self, *args, **kwargs) - self.clazz = OriginManager - -if __name__ == "__main__": - app = CommandLineInterface() +if __name__ == '__main__': + app = ReviewBot.CommandLineInterface() + app.clazz = OriginManager sys.exit(app.main()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190923.83f1d51c/osclib/core.py new/openSUSE-release-tools-20190924.e9a2774a/osclib/core.py --- old/openSUSE-release-tools-20190923.83f1d51c/osclib/core.py 2019-09-24 01:45:31.000000000 +0200 +++ new/openSUSE-release-tools-20190924.e9a2774a/osclib/core.py 2019-09-24 23:18:23.000000000 +0200 @@ -511,7 +511,7 @@ return True def package_kind(apiurl, project, package): - if package.startswith('00'): + if package.startswith('00') or package.startswith('_'): return 'meta' if ':' in package: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190923.83f1d51c/osclib/stagingapi.py new/openSUSE-release-tools-20190924.e9a2774a/osclib/stagingapi.py --- old/openSUSE-release-tools-20190923.83f1d51c/osclib/stagingapi.py 2019-09-24 01:45:31.000000000 +0200 +++ new/openSUSE-release-tools-20190924.e9a2774a/osclib/stagingapi.py 2019-09-24 23:18:23.000000000 +0200 @@ -890,7 +890,7 @@ if fail_count < 3: return True - log = self.buildlog_get(project, package, repository, architecture) + log = self.buildlog_get(project, package, repository, architecture, -4096) if 'Job seems to be stuck here, killed.' in log: return True @@ -922,6 +922,14 @@ all_bytes = bytes.maketrans(b'', b'') remove_bytes = all_bytes[:8] + all_bytes[14:32] # accept tabs and newlines + path = ['build', prj, repository, arch, package, '_log'] + if offset < 0: + url = makeurl(self.apiurl, path, {'view': 'entry'}) + root = ET.parse(http_GET(url)).getroot() + size = root.xpath('entry[@name="_log"]/@size') + if size: + offset += int(size[0]) + query = {'nostream': '1', 'start': '%s' % offset} if last: query['last'] = 1 @@ -929,7 +937,7 @@ while True: query['start'] = offset start_offset = offset - u = makeurl(self.apiurl, ['build', prj, repository, arch, package, '_log'], query=query) + u = makeurl(self.apiurl, path, query) for data in streamfile(u, bufsize="line"): offset += len(data) if strip_time: ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.VN94AH/_old 2019-09-26 20:40:42.202627565 +0200 +++ /var/tmp/diff_new_pack.VN94AH/_new 2019-09-26 20:40:42.202627565 +0200 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20190923.83f1d51c -mtime: 1569282331 -commit: 83f1d51c3b67e42f7d5d253bbea42273525838e2 +version: 20190924.e9a2774a +mtime: 1569359903 +commit: e9a2774a4530d223cb7f3a6b2a90edcb10cd7e85