Changeset 123

Timestamp:

12/13/10 05:04:53 (13 years ago)

Author:

nanardon

Message:

• fix binaries/sources search on nosrc.rpm

File:

• server/trunk/web/lib/Sophie/Controller/Rpms.pm (modified) (3 diffs)

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

@@ -146 +146 @@
 
     my $sourcerpm = $c->forward('queryformat', [ $pkgid, '%{SOURCERPM}' ]);
+    my $nosourcerpm = $sourcerpm;
+    $nosourcerpm =~ s/\.src.rpm$/\.nosrc.rpm/;
 
     $c->stash->{xmlrpc} = [ $c->model('Base::Rpms')->search(
@@ -151 +153 @@
             pkgid => { 
                 IN => $c->model('Base::RpmFile')->search(
-                    { filename => $sourcerpm, }
+                    { filename => [ $sourcerpm, $nosourcerpm ] }
                 )->get_column('pkgid')->as_query
             },
@@ -163 +165 @@
     my $sourcerpm = $c->forward('queryformat', [ $pkgid,
             '%{NAME}-%{VERSION}-%{RELEASE}.src.rpm' ]);
+    my $nosourcerpm = $sourcerpm;
+    $nosourcerpm =~ s/\.src.rpm$/\.nosrc.rpm/;
 
     my $tagrs = $c->model('Base')->resultset('Tags')
-        ->search({ tagname => 'sourcerpm', value => $sourcerpm })
+        ->search({ tagname => 'sourcerpm', value => [ $sourcerpm, $nosourcerpm ] })
         ->get_column('pkgid');
     $c->stash->{xmlrpc} = [ $c->model('Base::Rpms')->search(