From 241ff8fbd79f9f17cd326a34eb39096851f630ba Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 8 Aug 2012 22:07:06 -0500
Subject: Extract parse_version function from reporead logic

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 devel/management/commands/reporead.py |  9 ++-------
 packages/utils.py                     | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py
index 8b55b09a..af0a2dc0 100644
--- a/devel/management/commands/reporead.py
+++ b/devel/management/commands/reporead.py
@@ -34,6 +34,7 @@
 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 @@ def populate(self, values):
                 # 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]))
diff --git a/packages/utils.py b/packages/utils.py
index 6d54d71a..d4b4e611 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -1,6 +1,7 @@
 from collections import defaultdict
 from itertools import chain
 from operator import itemgetter
+import re
 
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import connection
@@ -14,6 +15,23 @@
         License, Depend, Conflict, Provision, Replacement,
         SignoffSpecification, Signoff, DEFAULT_SIGNOFF_SPEC)
 
+
+VERSION_RE = re.compile(r'^((\d+):)?(.+)-([^-]+)$')
+
+
+def parse_version(version):
+    match = VERSION_RE.match(version)
+    if not match:
+        return None, None, 0
+    ver = match.group(3)
+    rel = match.group(4)
+    if match.group(2):
+        epoch = int(match.group(2))
+    else:
+        epoch = 0
+    return ver, rel, epoch
+
+
 @cache_function(127)
 def get_group_info(include_arches=None):
     raw_groups = PackageGroup.objects.values_list(
-- 
cgit v1.2.3-54-g00ecf