Skip to content

Commit

Permalink
improved "ck search" to search tags in entries with inheritance
Browse files Browse the repository at this point in the history
  • Loading branch information
gfursin committed May 21, 2021
1 parent f1f95cf commit 08ab19b
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions ck/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -6015,7 +6008,6 @@ def status(i):

ok = rx['ok']
version_str = rx['current_version']
print (version_str)
if ok != 'yes':
outdated = 'yes'

Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 08ab19b

Please sign in to comment.