Subversion Repositories DevTools

Rev

Rev 7304 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7304 Rev 7306
Line 211... Line 211...
211
            $data->{arch} = $4;
211
            $data->{arch} = $4;
212
            $data->{type} = $5;
212
            $data->{type} = $5;
213
            $data->{arch} =~ s~_[PD]~~;
213
            $data->{arch} =~ s~_[PD]~~;
214
            $alias = join('.', $data->{name}, $data->{prj}, $data->{arch}, $data->{type} );
214
            $alias = join('.', $data->{name}, $data->{prj}, $data->{arch}, $data->{type} );
215
        }
215
        }
-
 
216
        elsif ( $file =~ m~^(.*)-(.*)-(.*)\.(.*)\.(rpm)$~i)
-
 
217
        {
-
 
218
            $data->{name} = $1;
-
 
219
            $data->{version} = $2;
-
 
220
            $data->{release} = $3;
-
 
221
            $data->{arch} = $4;
-
 
222
            $data->{type} = $5;
-
 
223
            $alias = join('.', $data->{name}, $data->{arch}, $data->{type} );
-
 
224
        }
216
        elsif ( $file =~ m~^(.*)-($pv)\.(.*)\.(rpm)$~i)
225
        elsif ( $file =~ m~^(.*)-($pv)\.(.*)\.(rpm)$~i)
217
        {
226
        {
218
            # COTS package
227
            # COTS package
219
            $data->{name} = $1;
228
            $data->{name} = $1;
220
            $data->{version} = $2;
229
            $data->{version} = $2;
Line 248... Line 257...
248
 
257
 
249
            $data->{version} = $pvfull;
258
            $data->{version} = $pvfull;
250
            $data->{prj} = $proj;
259
            $data->{prj} = $proj;
251
        }
260
        }
252
 
261
 
253
        unless ($data && $data->{name} && $data->{prj} && $data->{type}) {
262
        unless (($data && $data->{name} && $data->{prj} && $data->{type}) || $alias) {
254
            push @elist, $file;
263
            push @elist, $file;
255
            next;
264
            next;
256
        }
265
        }
257
        $data->{fullname} = $file;
266
        $data->{fullname} = $file;
258
 
267