diff options
| author | Mandrake <mandrake@mandriva.com> | 2006-08-24 10:15:24 +0000 |
|---|---|---|
| committer | Mandrake <mandrake@mandriva.com> | 2006-08-24 10:15:24 +0000 |
| commit | 0f62a1676f1049d65b0421c23eb68cf016623d19 (patch) | |
| tree | 50c57b8e1a7576cb63189af03b6a3426f34c59f3 | |
| parent | c61b40ec8a61b54a5df408b7e965afc74d461766 (diff) | |
| download | mga-youri-core-0f62a1676f1049d65b0421c23eb68cf016623d19.tar mga-youri-core-0f62a1676f1049d65b0421c23eb68cf016623d19.tar.gz mga-youri-core-0f62a1676f1049d65b0421c23eb68cf016623d19.tar.bz2 mga-youri-core-0f62a1676f1049d65b0421c23eb68cf016623d19.tar.xz mga-youri-core-0f62a1676f1049d65b0421c23eb68cf016623d19.zip | |
default section is contrib/release; also filter svn srpm format
| -rw-r--r-- | lib/Youri/Repository/Mandriva_upload.pm | 4 | ||||
| -rw-r--r-- | lib/Youri/Upload/Action/Install.pm | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Youri/Repository/Mandriva_upload.pm b/lib/Youri/Repository/Mandriva_upload.pm index f2dd1d9..edbfa50 100644 --- a/lib/Youri/Repository/Mandriva_upload.pm +++ b/lib/Youri/Repository/Mandriva_upload.pm @@ -267,8 +267,8 @@ sub _get_section { # use defined section if not found $section = $define->{section} unless $section; - die "Can't guess destination: section missing" unless $section; - + print STDERR "Can't guess destination: section missing, defaulting to contrib/release" unless $section; + $section = 'contrib/release'; return $section; } diff --git a/lib/Youri/Upload/Action/Install.pm b/lib/Youri/Upload/Action/Install.pm index cf9891e..df65991 100644 --- a/lib/Youri/Upload/Action/Install.pm +++ b/lib/Youri/Upload/Action/Install.pm @@ -37,7 +37,8 @@ sub run { my $dest = $repository->get_install_dir($package, $target, $define); # FIXME remove prefix this should be done by a function - $rpm =~ s/^\d{14}\.\w+\.\w+\.\d+_//; + $rpm =~ s/^\d{14}\.\w*\.\w+\.\d+_//; + $rpm =~ s/^\@\d+://; print "installing file $file to $dest/$rpm\n" if $self->{_verbose}; unless ($self->{_test}) { |