From 08ab19bfbbbaf18b9630ce5b2e4f74782e9fa861 Mon Sep 17 00:00:00 2001 From: Grigori Fursin Date: Fri, 21 May 2021 15:19:36 +0200 Subject: [PATCH] improved "ck search" to search tags in entries with inheritance --- ck/kernel.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ck/kernel.py b/ck/kernel.py index 836d0a5d2c..b042223be4 100755 --- a/ck/kernel.py +++ b/ck/kernel.py @@ -28,7 +28,7 @@ # We use 3 digits for the main (released) version and 4th digit for development revision -__version__ = "2.2.0.1" +__version__ = "2.3.0" # Do not use characters (to detect outdated version)! # Import packages that are global for the whole kernel @@ -5968,13 +5968,6 @@ def status(i): o = i.get('out', '') - # Get current version - r = get_version({}) - if r['return']>0: return r - - version_str = r['version_str'] - - # Read setup.py from GitHub (may want to use releases info in the future) try: import urllib.request as urllib2 except: @@ -6015,7 +6008,6 @@ def status(i): ok = rx['ok'] version_str = rx['current_version'] - print (version_str) if ok != 'yes': outdated = 'yes' @@ -10381,6 +10373,17 @@ def search_filter(i): return r d = r['dict'] + # Process base entry (basic inheritance - prototyped by Grigori on 20210519) + if d.get('_base_entry','').strip()!='': + rb = process_meta_for_inheritance({'repo_uoa':i.get('repo_uoa',''), + 'module_uoa':i.get('module_uoa',''), + 'data_uoa':i.get('data_uoa',''), + 'dict':d, + 'base_recursion':0}) + if rb['return']>0: return rb + + d = rb['dict'] + # Check directly rx = compare_dicts({'dict1': d, 'dict2': sd, 'ignore_case': ic}) if rx['return'] > 0: