diff options
Diffstat (limited to 'store/utilities.py')
| -rw-r--r-- | store/utilities.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/store/utilities.py b/store/utilities.py index bce9a7b..0f5465b 100644 --- a/store/utilities.py +++ b/store/utilities.py @@ -44,24 +44,17 @@ from M2Crypto import SMIME, BIO, X509 from OpenSSL.crypto import load_pkcs12, FILETYPE_PEM, dump_privatekey, dump_certificate from django.conf import settings +from tags import SoftwareTagList, SoftwareTag import osandarch -def validateTag(tag): - for i in tag: - if not i.isalnum(): - if i != "_": - return False - return True - def makeTagList(pkgdata): - taglist = set() + taglist = SoftwareTagList() for fields in ('extra', 'extraSigned'): if fields in pkgdata['header']: if 'tags' in pkgdata['header'][fields]: - tags = set(pkgdata['header'][fields]['tags']) # Fill tags list then add them - taglist = taglist.union(tags) - tags = ','.join(taglist) - return tags + for i in list(pkgdata['header'][fields]['tags']): # Fill tags list then add them + taglist.append(SoftwareTag(i)) + return str(taglist) def packagePath(appId = None, architecture = None): path = settings.MEDIA_ROOT + 'packages/' |