Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package obs-scm-bridge for openSUSE:Factory checked in at 2025-07-30 11:43:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-scm-bridge (Old) and /work/SRC/openSUSE:Factory/.obs-scm-bridge.new.13279 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-scm-bridge" Wed Jul 30 11:43:12 2025 rev:22 rq:1296171 version:0.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/obs-scm-bridge/obs-scm-bridge.changes 2025-07-15 16:47:42.761199452 +0200 +++ /work/SRC/openSUSE:Factory/.obs-scm-bridge.new.13279/obs-scm-bridge.changes 2025-07-30 11:44:37.364846992 +0200 @@ -1,0 +2,17 @@ +Mon Jul 28 14:53:36 UTC 2025 - Adrian Schröter <adr...@suse.de> + +- 0.7.4 + * syntax fix + +------------------------------------------------------------------- +Fri Jul 25 11:29:07 UTC 2025 - Adrian Schröter <adr...@suse.de> + +- 0.7.3 + * fix .gitsubmodule parser to handle space and tabs mixed + +------------------------------------------------------------------- +Tue Jul 22 14:46:43 UTC 2025 - Adrian Schröter <adr...@suse.de> + +- package /etc/obs/service directories + +------------------------------------------------------------------- Old: ---- obs-scm-bridge-0.7.2.obscpio New: ---- obs-scm-bridge-0.7.4.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-scm-bridge.spec ++++++ --- /var/tmp/diff_new_pack.lTkGnC/_old 2025-07-30 11:44:38.832907824 +0200 +++ /var/tmp/diff_new_pack.lTkGnC/_new 2025-07-30 11:44:38.832907824 +0200 @@ -21,17 +21,23 @@ %else %define build_pkg_name build %endif + +# this needs to match the usd python in github test suite +%define our_python3_version 11 + Name: obs-scm-bridge -Version: 0.7.2 +Version: 0.7.4 Release: 0 Summary: A help service to work with git repositories in OBS License: GPL-2.0-or-later URL: https://github.com/openSUSE/obs-scm-bridge Source0: %{name}-%{version}.tar.xz +BuildRequires: python3%{our_python3_version} +BuildRequires: python3%{our_python3_version}-PyYAML Requires: %{build_pkg_name} >= 20211125 -Requires: python3-PyYAML >= 6.0.0 # these are just recommends in build package, but we need it here Requires: perl(Date::Parse) +Requires: git-lfs Requires: perl(LWP::UserAgent) Requires: perl(Net::SSL) Requires: perl(Pod::Usage) @@ -39,15 +45,9 @@ Requires: perl(URI) Requires: perl(XML::Parser) Requires: perl(YAML::LibYAML) -Recommends: python3-packaging BuildArch: noarch -# git 2.49 for SHA1 submodule support in SHA256 repositories -%if 0%{?fedora} || 0%{?rhel} -Requires: git >= 2.49 -%else -Requires: git-core >= 2.49 -Requires: git-lfs -%endif +Requires: python3%{our_python3_version}-PyYAML +Recommends: python3%{our_python3_version}-packaging %description @@ -55,10 +55,26 @@ %autosetup %build +sed -i 's,^#!/usr/bin/python3.*,#!/usr/bin/python3.%our_python3_version,' obs_scm_bridge %install -%make_install +make DESTDIR=%{buildroot} install + +mkdir -p %buildroot/etc/obs/services/scm-bridge +echo "src.opensuse.org" > %buildroot/etc/obs/services/scm-bridge/critical-instances +# we would need to configure permissions and owner ship for this file +# but we don't want to enforce obs server package for userid +#echo "" > %buildroot/etc/obs/services/scm-bridge/credentials %files %{_prefix}/lib/obs/service +%dir /etc/obs +%dir /etc/obs/services +%dir /etc/obs/services/scm-bridge +%config(noreplace) /etc/obs/services/scm-bridge/critical-instances + +%check +# the test suite requires online resources unfortunatly +# so let's at least test if our python version understands our syntax +python3.%our_python3_version obs_scm_bridge --help ++++++ _service ++++++ --- /var/tmp/diff_new_pack.lTkGnC/_old 2025-07-30 11:44:38.864909150 +0200 +++ /var/tmp/diff_new_pack.lTkGnC/_new 2025-07-30 11:44:38.864909150 +0200 @@ -2,8 +2,8 @@ <service name="obs_scm" mode="manual"> <param name="url">https://github.com/openSUSE/obs-scm-bridge</param> <param name="scm">git</param> - <param name="revision">0.7.2</param> - <param name="version">0.7.2</param> + <param name="revision">0.7.4</param> + <param name="version">0.7.4</param> </service> <service mode="manual" name="set_version" /> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.lTkGnC/_old 2025-07-30 11:44:38.892910310 +0200 +++ /var/tmp/diff_new_pack.lTkGnC/_new 2025-07-30 11:44:38.896910475 +0200 @@ -1,4 +1,4 @@ -build (0.7.2) unstable; urgency=low +build (0.7.4) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection ++++++ obs-scm-bridge-0.7.2.obscpio -> obs-scm-bridge-0.7.4.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-scm-bridge-0.7.2/obs_scm_bridge new/obs-scm-bridge-0.7.4/obs_scm_bridge --- old/obs-scm-bridge-0.7.2/obs_scm_bridge 2025-07-15 14:02:27.000000000 +0200 +++ new/obs-scm-bridge-0.7.4/obs_scm_bridge 2025-07-28 15:52:01.000000000 +0200 @@ -282,6 +282,9 @@ def do_clone_commit(self, outdir: str, include_submodules: bool=False) -> None: assert self.revision, "no revision is set but do_clone_commit was called" objectformat='--object-format=sha1' + # we don't check for trailing zeros here on purpose. This blocks the usage + # of SHA1 package git in a SHA256 git project. If this is needed, we may + # implement a switch for that. if len(self.revision) == 64: objectformat='--object-format=sha256' cmd = [ 'git', 'init', objectformat, outdir ] @@ -681,7 +684,15 @@ def parse_gsmconfig(self): self.gsmconfig = configparser.ConfigParser() - self.gsmconfig.read(self.clonedir + '/.gitmodules') + + # the parser stumbles over a mix of space and tabs. So, let's strip + # leading whitespaces first + gitmodules = None + with open(self.clonedir + '/.gitmodules') as f: + gitmodules = f.read() + gitmodules = "\n".join([line.lstrip() for line in gitmodules.split("\n")]) + + self.gsmconfig.read_string(gitmodules) gsmpath = {} for section in self.gsmconfig.sections(): gsmconfig = self.gsmconfig[section] ++++++ obs-scm-bridge.dsc ++++++ --- /var/tmp/diff_new_pack.lTkGnC/_old 2025-07-30 11:44:39.036916277 +0200 +++ /var/tmp/diff_new_pack.lTkGnC/_new 2025-07-30 11:44:39.040916442 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 0.7.2 +Version: 0.7.4 Binary: build Maintainer: Adrian Schroeter <adr...@suse.de> Architecture: all ++++++ obs-scm-bridge.obsinfo ++++++ --- /var/tmp/diff_new_pack.lTkGnC/_old 2025-07-30 11:44:39.060917271 +0200 +++ /var/tmp/diff_new_pack.lTkGnC/_new 2025-07-30 11:44:39.064917437 +0200 @@ -1,5 +1,5 @@ name: obs-scm-bridge -version: 0.7.2 -mtime: 1752580947 -commit: 4c9cd6a06f2d7197ea21c3c5b26be71742a63e61 +version: 0.7.4 +mtime: 1753710721 +commit: c5b542abe52ff191614e0ac071496cbc2f83c8f1
