sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.client/entropy.db] drop matchTag argument from atom_match and atomMatch (use proper atom syntax instead!)

Browse Source
This commit is contained in:
Fabio Erculiani
2010-01-13 17:44:51 +01:00
parent ebdc53afd8
commit 43f62fe86c
3 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/entropy/client/interfaces/dep.py
View File

@@ -201,10 +201,9 @@ class CalculatorsMixin:
return dbconn
def atom_match(self, atom, caseSensitive = True, matchSlot = None,
matchTag = None, packagesFilter = True,
multiMatch = False, multiRepo = False, matchRevision = None,
matchRepo = None, server_repos = None, serverInstance = None,
extendedResults = False, useCache = True):
packagesFilter = True, multiMatch = False, multiRepo = False,
matchRevision = None, matchRepo = None, server_repos = None,
serverInstance = None, extendedResults = False, useCache = True):
# support match in repository from shell
# atom@repo1,repo2,repo3
@@ -214,21 +213,18 @@ class CalculatorsMixin:
u_hash = ""
k_ms = "//"
k_mt = "@#@"
k_mr = "-1"
if isinstance(matchRepo, (list, tuple, set)):
u_hash = hash(frozenset(matchRepo))
if const_isstring(matchSlot):
k_ms = matchSlot
if const_isstring(matchTag):
k_mt = matchTag
if const_isstring(matchRevision):
k_mr = matchRevision
repos_ck = self._all_repositories_checksum()
c_hash = "%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s" % (
c_hash = "%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s" % (
repos_ck,
atom, k_ms, k_mt, packagesFilter,
atom, k_ms, packagesFilter,
hash(frozenset(self.validRepositories)),
hash(frozenset(self.SystemSettings['repositories']['available'])),
multiMatch, multiRepo, caseSensitive,
@@ -269,7 +265,6 @@ class CalculatorsMixin:
atom,
caseSensitive = caseSensitive,
matchSlot = matchSlot,
matchTag = matchTag,
packagesFilter = packagesFilter,
matchRevision = matchRevision,
extendedResults = extendedResults,
@@ -330,7 +325,6 @@ class CalculatorsMixin:
atom,
caseSensitive = caseSensitive,
matchSlot = matchSlot,
matchTag = matchTag,
packagesFilter = packagesFilter,
multiMatch = True,
extendedResults = extendedResults
@@ -347,7 +341,6 @@ class CalculatorsMixin:
atom,
caseSensitive = caseSensitive,
matchSlot = matchSlot,
matchTag = matchTag,
packagesFilter = packagesFilter,
multiMatch = True,
extendedResults = extendedResults

37
libraries/entropy/db/__init__.py
View File

@@ -8205,8 +8205,8 @@ class EntropyRepository(EntropyRepositoryPluginStore, TextInterface):
return set(filter(myfilter, foundIDs))
def atomMatch(self, atom, caseSensitive = True, matchSlot = None,
multiMatch = False, matchTag = None, packagesFilter = True,
matchRevision = None, extendedResults = False, useCache = True):
multiMatch = False, packagesFilter = True, matchRevision = None,
extendedResults = False, useCache = True):
"""
Match given atom (or dependency) in repository and return its package
@@ -8221,8 +8221,6 @@ class EntropyRepository(EntropyRepositoryPluginStore, TextInterface):
@keyword multiMatch: match all the available packages, not just the
best one
@type multiMatch: bool
@keyword matchTag: match packages with given tag
@type matchTag: string
@keyword packagesFilter: enable package masking filter
@type packagesFilter: bool
@keyword matchRevision: match packages with given entropy revision
@@ -8246,8 +8244,7 @@ class EntropyRepository(EntropyRepositoryPluginStore, TextInterface):
if useCache:
cached = self.__atomMatchFetchCache(
atom, caseSensitive, matchSlot,
multiMatch, matchTag,
packagesFilter, matchRevision,
multiMatch, packagesFilter, matchRevision,
extendedResults
)
if isinstance(cached, tuple):
@@ -8261,7 +8258,7 @@ class EntropyRepository(EntropyRepositoryPluginStore, TextInterface):
if isinstance(cached, tuple):
return cached
atomTag = entropy.tools.dep_gettag(atom)
matchTag = entropy.tools.dep_gettag(atom)
try:
matchUse = entropy.tools.dep_getusedeps(atom)
except InvalidAtom:
@@ -8275,8 +8272,6 @@ class EntropyRepository(EntropyRepositoryPluginStore, TextInterface):
scan_atom = entropy.tools.remove_usedeps(atom)
# tag match
scan_atom = entropy.tools.remove_tag(scan_atom)
if (matchTag is None) and (atomTag is not None):
matchTag = atomTag
# slot match
scan_atom = entropy.tools.remove_slot(scan_atom)
@@ -8351,8 +8346,7 @@ class EntropyRepository(EntropyRepositoryPluginStore, TextInterface):
x = (-1, 1, None, None, None,)
self.__atomMatchStoreCache(
atom, caseSensitive, matchSlot,
multiMatch, matchTag,
packagesFilter, matchRevision,
multiMatch, packagesFilter, matchRevision,
extendedResults, result = (x, 1)
)
return x, 1
@@ -8363,8 +8357,7 @@ class EntropyRepository(EntropyRepositoryPluginStore, TextInterface):
x = -1
self.__atomMatchStoreCache(
atom, caseSensitive, matchSlot,
multiMatch, matchTag,
packagesFilter, matchRevision,
multiMatch, packagesFilter, matchRevision,
extendedResults, result = (x, 1)
)
return x, 1
@@ -8375,8 +8368,7 @@ class EntropyRepository(EntropyRepositoryPluginStore, TextInterface):
self.retrieveRevision(x[0])) for x in dbpkginfo])
self.__atomMatchStoreCache(
atom, caseSensitive, matchSlot,
multiMatch, matchTag,
packagesFilter, matchRevision,
multiMatch, packagesFilter, matchRevision,
extendedResults, result = (x, 0)
)
return x, 0
@@ -8384,8 +8376,7 @@ class EntropyRepository(EntropyRepositoryPluginStore, TextInterface):
x = set([x[0] for x in dbpkginfo])
self.__atomMatchStoreCache(
atom, caseSensitive, matchSlot,
multiMatch, matchTag,
packagesFilter, matchRevision,
multiMatch, packagesFilter, matchRevision,
extendedResults, result = (x, 0)
)
return x, 0
@@ -8398,16 +8389,14 @@ class EntropyRepository(EntropyRepositoryPluginStore, TextInterface):
self.__atomMatchStoreCache(
atom, caseSensitive, matchSlot,
multiMatch, matchTag,
packagesFilter, matchRevision,
multiMatch, packagesFilter, matchRevision,
extendedResults, result = (x, 0)
)
return x, 0
else:
self.__atomMatchStoreCache(
atom, caseSensitive, matchSlot,
multiMatch, matchTag,
packagesFilter, matchRevision,
multiMatch, packagesFilter, matchRevision,
extendedResults, result = (x[0], 0)
)
return x[0], 0
@@ -8428,16 +8417,14 @@ class EntropyRepository(EntropyRepositoryPluginStore, TextInterface):
x = (x, 0, newer[0], newer[1], newer[2])
self.__atomMatchStoreCache(
atom, caseSensitive, matchSlot,
multiMatch, matchTag,
packagesFilter, matchRevision,
multiMatch, packagesFilter, matchRevision,
extendedResults, result = (x, 0)
)
return x, 0
else:
self.__atomMatchStoreCache(
atom, caseSensitive, matchSlot,
multiMatch, matchTag,
packagesFilter, matchRevision,
multiMatch, packagesFilter, matchRevision,
extendedResults, result = (x, 0)
)
return x, 0

5
server/server_reagent.py
View File

@@ -143,8 +143,7 @@ def repositories(options):
# match
idpackages = []
for package in atoms:
match = Entropy.atom_match(package, matchRepo = [repo],
matchTag = '')
match = Entropy.atom_match(package + '#', matchRepo = [repo])
if (match[1] == repo):
idpackages.append(match[0])
else:
@@ -174,7 +173,7 @@ def repositories(options):
# match
idpackages = []
for package in atoms:
match = Entropy.atom_match(package, matchRepo = [repo], matchTag = '')
match = Entropy.atom_match(package + '#', matchRepo = [repo])
if match[1] == repo:
idpackages.append(match[0])
else: