diff options
| author | Dan McGee <dan@archlinux.org> | 2012-08-09 05:07:06 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-08-09 05:07:06 +0200 |
| commit | 241ff8fbd79f9f17cd326a34eb39096851f630ba (patch) | |
| tree | f95a16608c41545b759dce1d6a4303a48374fdf1 /devel | |
| parent | 411ccfb3c74c521969ca6b68459289134976547d (diff) | |
| download | archweb-241ff8fbd79f9f17cd326a34eb39096851f630ba.tar.gz archweb-241ff8fbd79f9f17cd326a34eb39096851f630ba.tar.xz | |
Extract parse_version function from reporead logic
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/management/commands/reporead.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py index 8b55b09..af0a2dc 100644 --- a/devel/management/commands/reporead.py +++ b/devel/management/commands/reporead.py @@ -34,6 +34,7 @@ from devel.utils import UserFinder from main.models import Arch, Package, PackageFile, Repo from main.utils import database_vendor from packages.models import Depend, Conflict, Provision, Replacement, Update +from packages.utils import parse_version logging.basicConfig( @@ -84,8 +85,6 @@ class RepoPackage(object): 'conflicts', 'provides', 'replaces', 'groups', 'license', 'files' ) - version_re = re.compile(r'^((\d+):)?(.+)-([^-]+)$') - def __init__(self, repo): self.repo = repo self.ver = None @@ -112,11 +111,7 @@ class RepoPackage(object): # do NOT prune these values at all setattr(self, k, v[0]) elif k == 'version': - match = self.version_re.match(v[0]) - self.ver = match.group(3) - self.rel = match.group(4) - if match.group(2): - self.epoch = int(match.group(2)) + self.ver, self.rel, self.epoch = parse_version(v[0]) elif k == 'builddate': try: builddate = datetime.utcfromtimestamp(int(v[0])) |