external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

git-update.py: Cast epoch to an integer

Browse source 
Convert epoch values before doing integer comparisons. Also, add a
sanity check for the epoch variable.

Reported-by: Ido Rosen <ido@kernel.org>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-12-30 12:28:25 +01:00
parent 3d12d3888a
commit 965f908e15
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/git-integration/git-update.py
View file

@ -42,8 +42,8 @@ def save_srcinfo(srcinfo, db, cur, user):
for pkgname in srcinfo.GetPackageNames(): for pkgname in srcinfo.GetPackageNames():
pkginfo = srcinfo.GetMergedPackage(pkgname) pkginfo = srcinfo.GetMergedPackage(pkgname)
if 'epoch' in pkginfo and pkginfo['epoch'] > 0: if 'epoch' in pkginfo and int(pkginfo['epoch']) > 0:
ver = '%d:%s-%s' % (pkginfo['epoch'], pkginfo['pkgver'], ver = '%d:%s-%s' % (int(pkginfo['epoch']), pkginfo['pkgver'],
pkginfo['pkgrel']) pkginfo['pkgrel'])
else: else:
ver = '%s-%s' % (pkginfo['pkgver'], pkginfo['pkgrel']) ver = '%s-%s' % (pkginfo['pkgver'], pkginfo['pkgrel'])
@ -189,6 +189,9 @@ for commit in walker:
for pkgname in srcinfo.GetPackageNames(): for pkgname in srcinfo.GetPackageNames():
pkginfo = srcinfo.GetMergedPackage(pkgname) pkginfo = srcinfo.GetMergedPackage(pkgname)
if 'epoch' in pkginfo and not pkginfo['epoch'].isdigit():
die_commit('invalid epoch: %s' % (pkginfo['epoch']), commit.id)
if not re.match(r'[a-z0-9][a-z0-9\.+_-]*$', pkginfo['pkgname']): if not re.match(r'[a-z0-9][a-z0-9\.+_-]*$', pkginfo['pkgname']):
die_commit('invalid package name: %s' % (pkginfo['pkgname']), die_commit('invalid package name: %s' % (pkginfo['pkgname']),
commit.id) commit.id)