From 0f62a1676f1049d65b0421c23eb68cf016623d19 Mon Sep 17 00:00:00 2001 From: Mandrake Date: Thu, 24 Aug 2006 10:15:24 +0000 Subject: default section is contrib/release; also filter svn srpm format --- lib/Youri/Repository/Mandriva_upload.pm | 4 ++-- 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}) { -- cgit v1.2.1