djeuscan: temporary fix for ebuild/metadata

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>

4 files changed, 8 insertions, 9 deletions

diff --git a/euscanwww/djeuscan/helpers.py b/euscanwww/djeuscan/helpers.py
index 6e8b4a0..177b91c 100644
--- a/euscanwww/djeuscan/helpers.py
+++ b/euscanwww/djeuscan/helpers.py
@@ -102,7 +102,7 @@ def get_layman_repos():
 
 def versiontag_to_attrs(tag):
     import re
-    match = re.match(r"(.+)-(.+):(\d+)-(.+)", tag)
+    match = re.match(r"(.+)-(.+)-(.+)", tag)
     if match:
         return match.groups()
     else:
diff --git a/euscanwww/djeuscan/models.py b/euscanwww/djeuscan/models.py
index 8d3902d..e8ba83a 100644
--- a/euscanwww/djeuscan/models.py
+++ b/euscanwww/djeuscan/models.py
@@ -158,8 +158,7 @@ class Version(models.Model):
 
     @property
     def tag(self):
-        return '%s-%s:%s-%s' % (self.version, self.revision, self.slot,
-                                self.overlay)
+        return '%s-%s-%s' % (self.version, self.revision, self.overlay)
 
     @property
     def urls_list(self):
diff --git a/euscanwww/djeuscan/urls.py b/euscanwww/djeuscan/urls.py
index c3035df..ece411c 100644
--- a/euscanwww/djeuscan/urls.py
+++ b/euscanwww/djeuscan/urls.py
@@ -23,9 +23,9 @@ package_patterns = patterns('djeuscan.views',
     url(r'^unfavourite/$', unfavourite_package, name="unfavourite_package"),
     url(r'^refresh$', "refresh_package", name="refresh_package"),
     url(r'^problem$', 'problem', name="problem"),
-    url(r'^(?P<version_tag>[^/]+)/ebuild$', "package_version_ebuild",
+    url(r'^(?P<version_tag>.*)/ebuild$', "package_version_ebuild",
         name="package_version_ebuild"),
-    url(r'^(?P<version_tag>[^/]+)/metadata$', "package_version_metadata",
+    url(r'^(?P<version_tag>.*)/metadata$', "package_version_metadata",
         name="package_version_metadata"),
 )
 
diff --git a/euscanwww/djeuscan/views.py b/euscanwww/djeuscan/views.py
index eccffe4..9fb8879 100644
--- a/euscanwww/djeuscan/views.py
+++ b/euscanwww/djeuscan/views.py
@@ -227,11 +227,11 @@ def package(request, category, package):
 def package_version_metadata(request, category, package, version_tag):
     package = get_object_or_404(Package, category=category, name=package)
     try:
-        ver, rev, slot, over = versiontag_to_attrs(version_tag)
+        ver, rev, over = versiontag_to_attrs(version_tag)
     except TypeError:
         return HttpResponseNotFound()
     version = get_object_or_404(Version, package=package, version=ver,
-                                revision=rev, slot=slot, overlay=over)
+                                revision=rev, overlay=over)
     content = ""
     if version.metadata_path:
         with open(version.metadata_path) as meta_file:
@@ -242,11 +242,11 @@ def package_version_metadata(request, category, package, version_tag):
 def package_version_ebuild(request, category, package, version_tag):
     package = get_object_or_404(Package, category=category, name=package)
     try:
-        ver, rev, slot, over = versiontag_to_attrs(version_tag)
+        ver, rev, over = versiontag_to_attrs(version_tag)
     except TypeError:
         return HttpResponseNotFound()
     version = get_object_or_404(Version, package=package, version=ver,
-                                revision=rev, slot=slot, overlay=over)
+                                revision=rev, overlay=over)
     if version.ebuild_path:
         with open(version.ebuild_path) as ebuild_file:
             content = ebuild_file.read()