Merge branch 'master' of git.calculate.ru:/calculate-lib

develop
Самоукин Алексей 13 years ago
commit 687be04ac1

Binary file not shown.

@ -499,9 +499,11 @@ class fillVars(varsShare):
return ""
width = int(widthVal)
height = int(heightVal)
res = [(1024,768),
res = [(1024,600),
(1024,768),
(1280,1024),
(1280,800),
(1366,768),
(1440,900),
(1600,1200),
(1680,1050),

@ -456,8 +456,9 @@ class varsShare:
pkgInfoDir = path.join(systemroot,'var/db/pkg/app-misc/')
if not os.access(pkgInfoDir,os.R_OK):
return None
metaPkgs = filter(lambda x:"%s-meta"%shortname.lower() in x,
os.listdir(pkgInfoDir))
metaPkgs = sorted(filter(lambda x:"calculate-meta" in x or \
"%s-meta"%shortname.lower() in x,
os.listdir(pkgInfoDir)))
if metaPkgs:
reFindVer = re.compile("(?<=\-)\d+\.?\d*\.?\d*")
findVer = reFindVer.search(metaPkgs[0])

Loading…
Cancel
Save