![](https://seccdn.libravatar.org/avatar/128a7b98d536a9cf9b4d4d5a90d63475.jpg?s=120&d=mm&r=g)
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2024-07-02 18:19:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc" Tue Jul 2 18:19:26 2024 rev:197 rq:1184851 version:1.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2024-07-01 11:23:10.493176926 +0200 +++ /work/SRC/openSUSE:Factory/.osc.new.18349/osc.changes 2024-07-02 18:19:33.450242440 +0200 @@ -1,0 +2,9 @@ +Tue Jul 2 11:56:43 UTC 2024 - Daniel Mach <daniel.mach@suse.com> + +- 1.8.2 + - Library: + - Change 'repairwc' command to fix missing .osc/_osclib_version + - Make error message in check_store_version() more generic to work for both projects and packages + - Fix check_store_version in project store + +------------------------------------------------------------------- Old: ---- osc-1.8.1.tar.gz New: ---- osc-1.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.ouwJ5E/_old 2024-07-02 18:19:34.326274493 +0200 +++ /var/tmp/diff_new_pack.ouwJ5E/_new 2024-07-02 18:19:34.330274639 +0200 @@ -67,7 +67,7 @@ %endif Name: osc -Version: 1.8.1 +Version: 1.8.2 Release: 0 Summary: Command-line client for the Open Build Service License: GPL-2.0-or-later ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.ouwJ5E/_old 2024-07-02 18:19:34.362275810 +0200 +++ /var/tmp/diff_new_pack.ouwJ5E/_new 2024-07-02 18:19:34.366275956 +0200 @@ -1,6 +1,6 @@ pkgname=osc -pkgver=1.8.1 -pkgrel=88bf8a6a77d4f6e711b9b16732e40f83 +pkgver=1.8.2 +pkgrel=63005f5c57b69f5389cabb6ca5a033ed pkgdesc="Command-line client for the Open Build Service" arch=('x86_64') url="https://www.github.com/openSUSE/osc" ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.ouwJ5E/_old 2024-07-02 18:19:34.406277420 +0200 +++ /var/tmp/diff_new_pack.ouwJ5E/_new 2024-07-02 18:19:34.410277567 +0200 @@ -1,4 +1,4 @@ -osc (1.8.1-0) unstable; urgency=low +osc (1.8.2-0) unstable; urgency=low * Placeholder ++++++ osc-1.8.1.tar.gz -> osc-1.8.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.8.1/NEWS new/osc-1.8.2/NEWS --- old/osc-1.8.1/NEWS 2024-07-01 10:11:40.000000000 +0200 +++ new/osc-1.8.2/NEWS 2024-07-02 13:54:34.000000000 +0200 @@ -1,3 +1,9 @@ +- 1.8.2 + - Library: + - Change 'repairwc' command to fix missing .osc/_osclib_version + - Make error message in check_store_version() more generic to work for both projects and packages + - Fix check_store_version in project store + - 1.8.1 - Command-line: - Fix 'linkpac' command crash when used with '--disable-build' or '--disable-publish' option diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.8.1/osc/__init__.py new/osc-1.8.2/osc/__init__.py --- old/osc-1.8.1/osc/__init__.py 2024-07-01 10:11:40.000000000 +0200 +++ new/osc-1.8.2/osc/__init__.py 2024-07-02 13:54:34.000000000 +0200 @@ -13,7 +13,7 @@ from .util import git_version -__version__ = git_version.get_version('1.8.1') +__version__ = git_version.get_version('1.8.2') # vim: sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.8.1/osc/commandline.py new/osc-1.8.2/osc/commandline.py --- old/osc-1.8.1/osc/commandline.py 2024-07-01 10:11:40.000000000 +0200 +++ new/osc-1.8.2/osc/commandline.py 2024-07-02 13:54:34.000000000 +0200 @@ -10102,8 +10102,9 @@ if is_project_dir(i): try: prj = Project(i, getPackageList=False) - except oscerr.WorkingCopyInconsistent as e: - if '_apiurl' in e.dirty_files and (not apiurl or not opts.force_apiurl): + except (oscerr.WorkingCopyInconsistent, oscerr.NoWorkingCopy) as e: + dirty_files = getattr(e, "dirty_files", []) + if '_apiurl' in dirty_files and (not apiurl or not opts.force_apiurl): apiurl = get_apiurl(apiurls) prj = Project(i, getPackageList=False, wc_check=False) prj.wc_repair(apiurl) @@ -10122,8 +10123,9 @@ for pdir in pacs: try: p = Package(pdir) - except oscerr.WorkingCopyInconsistent as e: - if '_apiurl' in e.dirty_files and (not apiurl or not opts.force_apiurl): + except (oscerr.WorkingCopyInconsistent, oscerr.NoWorkingCopy) as e: + dirty_files = getattr(e, "dirty_files", []) + if '_apiurl' in dirty_files and (not apiurl or not opts.force_apiurl): apiurl = get_apiurl(apiurls) p = Package(pdir, wc_check=False) p.wc_repair(apiurl) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.8.1/osc/obs_scm/package.py new/osc-1.8.2/osc/obs_scm/package.py --- old/osc-1.8.1/osc/obs_scm/package.py 2024-07-01 10:11:40.000000000 +0200 +++ new/osc-1.8.2/osc/obs_scm/package.py 2024-07-02 13:54:34.000000000 +0200 @@ -51,7 +51,7 @@ self.dir = workingdir or "." self.absdir = os.path.abspath(self.dir) - self.store = osc_store.get_store(self.dir) + self.store = osc_store.get_store(self.dir, check=wc_check) self.store.assert_is_package() self.storedir = os.path.join(self.absdir, store) self.progress_obj = progress_obj @@ -178,8 +178,13 @@ def wc_repair(self, apiurl: Optional[str] = None): from ..core import get_source_file - store = Store(self.dir) + store = Store(self.dir, check=False) store.assert_is_package() + + # there was a time when osc did not write _osclib_version file; let's assume these checkouts have version 1.0 + if not store.exists("_osclib_version"): + store.write_string("_osclib_version", "1.0") + if not store.exists("_apiurl") or apiurl: if apiurl is None: msg = 'cannot repair wc: the \'_apiurl\' file is missing but ' \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.8.1/osc/obs_scm/project.py new/osc-1.8.2/osc/obs_scm/project.py --- old/osc-1.8.1/osc/obs_scm/project.py 2024-07-01 10:11:40.000000000 +0200 +++ new/osc-1.8.2/osc/obs_scm/project.py 2024-07-02 13:54:34.000000000 +0200 @@ -87,7 +87,7 @@ self.dir = Path(dir) self.absdir = os.path.abspath(dir) - self.store = Store(dir) + self.store = Store(dir, check=wc_check) self.progress_obj = progress_obj self.name = store_read_project(self.dir) @@ -140,8 +140,13 @@ return dirty_files def wc_repair(self, apiurl: Optional[str] = None): - store = Store(self.dir) + store = Store(self.dir, check=False) store.assert_is_project() + + # there was a time when osc did not write _osclib_version file; let's assume these checkouts have version 1.0 + if not store.exists("_osclib_version"): + store.write_string("_osclib_version", "1.0") + if not store.exists("_apiurl") or apiurl: if apiurl is None: msg = 'cannot repair wc: the \'_apiurl\' file is missing but ' \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.8.1/osc/obs_scm/store.py new/osc-1.8.2/osc/obs_scm/store.py --- old/osc-1.8.1/osc/obs_scm/store.py 2024-07-01 10:11:40.000000000 +0200 +++ new/osc-1.8.2/osc/obs_scm/store.py 2024-07-02 13:54:34.000000000 +0200 @@ -339,10 +339,13 @@ with open(versionfile) as f: v = f.read().strip() except: - v = '' + if is_project_dir(dir): + v = '1.0' + else: + v = '' if v == '': - msg = f'Error: "{os.path.abspath(dir)}" is not an osc package working copy.' + msg = f'Error: "{os.path.abspath(dir)}" is not an osc working copy.' if os.path.exists(os.path.join(dir, '.svn')): msg = msg + '\nTry svn instead of osc.' raise oscerr.NoWorkingCopy(msg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-1.8.1/osc/util/git_version.py new/osc-1.8.2/osc/util/git_version.py --- old/osc-1.8.1/osc/util/git_version.py 2024-07-01 10:11:40.000000000 +0200 +++ new/osc-1.8.2/osc/util/git_version.py 2024-07-02 13:54:34.000000000 +0200 @@ -9,7 +9,7 @@ """ # the `version` variable contents get substituted during `git archive` # it requires adding this to .gitattributes: <path to this file> export-subst - version = "1.8.1" + version = "1.8.2" if version.startswith(("$", "%")): # "$": version hasn't been substituted during `git archive` # "%": "Format:" and "$" characters get removed from the version string (a GitHub bug?) ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.ouwJ5E/_old 2024-07-02 18:19:34.830292934 +0200 +++ /var/tmp/diff_new_pack.ouwJ5E/_new 2024-07-02 18:19:34.834293081 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 1.8.1-0 +Version: 1.8.2-0 Binary: osc Maintainer: Adrian Schroeter <adrian@suse.de> Architecture: any