diff options
| author | Florent Villard <warly@mandriva.com> | 2006-08-06 17:42:38 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2006-08-06 17:42:38 +0000 |
| commit | 76b8db075aae22436f0779948a66f7221eb39432 (patch) | |
| tree | faeaeb276185959810ef21d91dea1f2cd1db9e3f /lib | |
| parent | 9478d85440450c4db3cbffa649b6782586644c22 (diff) | |
| download | mga-youri-core-76b8db075aae22436f0779948a66f7221eb39432.tar mga-youri-core-76b8db075aae22436f0779948a66f7221eb39432.tar.gz mga-youri-core-76b8db075aae22436f0779948a66f7221eb39432.tar.bz2 mga-youri-core-76b8db075aae22436f0779948a66f7221eb39432.tar.xz mga-youri-core-76b8db075aae22436f0779948a66f7221eb39432.zip | |
remove prefix when checking the file name for SVN
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Youri/Repository/Mandriva_upload.pm | 4 | ||||
| -rw-r--r-- | lib/Youri/Upload/Check/SVN.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Youri/Repository/Mandriva_upload.pm b/lib/Youri/Repository/Mandriva_upload.pm index 53ced5b..e334f39 100644 --- a/lib/Youri/Repository/Mandriva_upload.pm +++ b/lib/Youri/Repository/Mandriva_upload.pm @@ -33,7 +33,7 @@ sub _init { install_root => '', test => 0, # test mode verbose => 0, # verbose mode - queue => '' + queue => '', @_ ); @@ -44,7 +44,7 @@ sub _init { } } print "Initializing repository for @{$self->{_arch}}\n"; - foreach my $v ('queue', 'noarch', 'install_root', 'upload_root', 'verbose') { + foreach my $v ('svn', 'queue', 'noarch', 'install_root', 'upload_root', 'verbose') { $self->{"_$v"} = $options{$v} } $self diff --git a/lib/Youri/Upload/Check/SVN.pm b/lib/Youri/Upload/Check/SVN.pm index a1d66ea..6e7d57a 100644 --- a/lib/Youri/Upload/Check/SVN.pm +++ b/lib/Youri/Upload/Check/SVN.pm @@ -34,7 +34,7 @@ sub run { my $file = $package->get_file_name; my $srpm_name = $package->get_canonical_name; if ($repository->package_in_svn($srpm_name)) { - if ($file !~ /(^|\/)@\d+:\Q$srpm_name/) { + if ($file !~ /(^|\/|$define->{prefix}_)@\d+:\Q$srpm_name/) { $self->{_error} = "package $srpm_name is in the SVN, the uploaded SRPM must look like @<svn rev>:$srpm_name-<version>-<release>.src.rpm (created with getsrpm-mdk $srpm_name)"; return 0 } else { |