Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package b4 for openSUSE:Factory checked in at 2021-06-04 00:33:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/b4 (Old) and /work/SRC/openSUSE:Factory/.b4.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "b4" Fri Jun 4 00:33:37 2021 rev:16 rq:897086 version:0.7.1+0 Changes: -------- --- /work/SRC/openSUSE:Factory/b4/b4.changes 2021-06-02 22:11:39.680130072 +0200 +++ /work/SRC/openSUSE:Factory/.b4.new.1898/b4.changes 2021-06-04 00:33:50.992920790 +0200 @@ -1,0 +2,7 @@ +Thu Jun 03 04:03:19 UTC 2021 - [email protected] + +- Update to version 0.7.1+0: + * Fix cache aging cleanup of threads + * Limit 'From mboxrd@z' replacement to start of message + +------------------------------------------------------------------- Old: ---- b4-0.7.0+0.obscpio New: ---- b4-0.7.1+0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ b4.spec ++++++ --- /var/tmp/diff_new_pack.9ydno4/_old 2021-06-04 00:33:52.764925892 +0200 +++ /var/tmp/diff_new_pack.9ydno4/_new 2021-06-04 00:33:52.764925892 +0200 @@ -16,9 +16,9 @@ # -%define version_unconverted 0.7.0+0 +%define version_unconverted 0.7.1+0 Name: b4 -Version: 0.7.0+0 +Version: 0.7.1+0 Release: 0 Summary: Helper scripts for kernel.org patches License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.9ydno4/_old 2021-06-04 00:33:52.800925995 +0200 +++ /var/tmp/diff_new_pack.9ydno4/_new 2021-06-04 00:33:52.800925995 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://git.kernel.org/pub/scm/utils/b4/b4.git</param> - <param name="changesrevision">ee5e56d06c786d7906c214fc1f8cbbeeb3e658a6</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">ae866ac53fa029475d61cadf164a72f6ceaccefd</param></service></servicedata> \ No newline at end of file ++++++ b4-0.7.0+0.obscpio -> b4-0.7.1+0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/b4-0.7.0+0/b4/__init__.py new/b4-0.7.1+0/b4/__init__.py --- old/b4-0.7.0+0/b4/__init__.py 2021-05-26 19:36:22.000000000 +0200 +++ new/b4-0.7.1+0/b4/__init__.py 2021-06-02 21:23:05.000000000 +0200 @@ -43,7 +43,7 @@ except ModuleNotFoundError: can_patatt = False -__VERSION__ = '0.7.0' +__VERSION__ = '0.7.1' logger = logging.getLogger('b4') @@ -1882,7 +1882,7 @@ expmin = 600 expage = time.time() - expmin for entry in os.listdir(cachedir): - if entry.find('.mbx') <= 0 and entry.find('.lookup') <= 0 and entry.find('.msgs'): + if entry.find('.mbx') <= 0 and entry.find('.lookup') <= 0 and entry.find('.msgs') <= 0: continue fullpath = os.path.join(cachedir, entry) st = os.stat(fullpath) @@ -2275,7 +2275,7 @@ bmsg = msg.as_bytes(unixfrom=True, policy=emlpolicy) # public-inbox unixfrom says "mboxrd", so replace it with something else # so there is no confusion as it's NOT mboxrd - bmsg = bmsg.replace(b'From mboxrd@z ', b'From git@z ') + bmsg = re.sub(b'^From mboxrd@z ', b'From git@z ', bmsg) bmsg = bmsg.rstrip(b'\r\n') + b'\n\n' dest.write(bmsg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/b4-0.7.0+0/patatt/patatt/__init__.py new/b4-0.7.1+0/patatt/patatt/__init__.py --- old/b4-0.7.0+0/patatt/patatt/__init__.py 2021-05-26 19:36:22.000000000 +0200 +++ new/b4-0.7.1+0/patatt/patatt/__init__.py 2021-06-02 21:23:05.000000000 +0200 @@ -47,7 +47,7 @@ KEYCACHE = dict() # My version -__VERSION__ = '0.4.3' +__VERSION__ = '0.4.4' MAX_SUPPORTED_FORMAT_VERSION = 1 @@ -723,19 +723,21 @@ parts = source.split(':', 4) if len(parts) < 4: raise ConfigurationError('Invalid ref, must have at least 3 colons: %s' % source) - gittop = parts[1] + gitrepo = parts[1] gitref = parts[2] gitsub = parts[3] - if not gittop: - gittop = get_git_toplevel() - if not gittop: - raise KeyError('Not in a git tree, so cannot use a ref: source') - - gittop = os.path.expanduser(gittop) - if gittop.find('$') >= 0: - gittop = os.path.expandvars(gittop) - if os.path.isdir(os.path.join(gittop, '.git')): - gittop = os.path.join(gittop, '.git') + if not gitrepo: + gitrepo = get_git_toplevel() + if not gitrepo: + raise KeyError('Not in a git tree, so cannot use a ref:: source') + + gitrepo = os.path.expanduser(gitrepo) + if gitrepo.find('$') >= 0: + gitrepo = os.path.expandvars(gitrepo) + if os.path.isdir(os.path.join(gitrepo, '.git')): + gittop = os.path.join(gitrepo, '.git') + else: + gittop = gitrepo # it could omit the refspec, meaning "whatever the current ref" # grab the key from a fully ref'ed path @@ -767,8 +769,8 @@ logger.debug('KEYSRC : %s', keysrc) return out, 'ref:%s:%s' % (gittop, keysrc) - # Does it exist on disk in gittop? - fullpath = os.path.join(gittop, subpath) + # Does it exist on disk but hasn't been committed yet? + fullpath = os.path.join(gitrepo, subpath) if os.path.exists(fullpath): with open(fullpath, 'rb') as fh: logger.debug('KEYSRC : %s', fullpath) ++++++ b4.obsinfo ++++++ --- /var/tmp/diff_new_pack.9ydno4/_old 2021-06-04 00:33:52.904926295 +0200 +++ /var/tmp/diff_new_pack.9ydno4/_new 2021-06-04 00:33:52.904926295 +0200 @@ -1,5 +1,5 @@ name: b4 -version: 0.7.0+0 -mtime: 1622050582 -commit: ee5e56d06c786d7906c214fc1f8cbbeeb3e658a6 +version: 0.7.1+0 +mtime: 1622661785 +commit: ae866ac53fa029475d61cadf164a72f6ceaccefd
