Changeset 226

Timestamp:

12/29/10 15:31:35 (13 years ago)

Author:

nanardon

Message:

• another compatibility redirect

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Compat.pm (modified) (1 diff)
• lib/Sophie/Controller/Distrib.pm (modified) (1 diff)
• t/controller_Compat.t (modified) (1 diff)

server/trunk/web/lib/Sophie/Controller/Compat.pm

@@ -48 +48 @@
 }
 
+# /distrib/foo,bar,baz/RPM
+sub distrib :Private {
+    my ($self, $c, $distrib, $rpm) = @_;
+
+    my @args = split(',', $distrib);
+    if (@args == 2) {
+        unshift(@args, '');
+    }
+    $c->res->redirect($c->uri_for('/distrib', @args, 'rpms', $rpm));
+}
+
 =head1 AUTHOR
 

server/trunk/web/lib/Sophie/Controller/Distrib.pm

@@ -233 +233 @@
 sub list_arch :Path :Args(2) {
     my ( $self, $c, $distribution, $release ) = @_;
+
+    # Compatability with Sophie1
+    if ($distribution =~ /^([^,]+,)?[^,]+,[^,]+$/) {
+        $c->go('/compat/distrib', [ $distribution, $release ]);
+    }
+
     $c->stash->{dist}{distribution} = $distribution;
     $c->stash->{dist}{release} = $release;

server/trunk/web/t/controller_Compat.t

@@ -8 +8 @@
 ok( request('/viewrpm')->is_redirect, 'Request should succeed' );
 ok( request('/viewrpm/azerty')->is_redirect, 'Request should succeed' );
+ok( request('/distrib/Mandriva,cooker,i586/azerty')->is_redirect, 'Request should succeed' );
 done_testing();