Re: pkg_add adds an extra / to pkg_path

[Siju George]

On 2/3/09, Stuart Henderson <s...@spacehopper.org> wrote:
>
> This diff removes the extra / and hasn't broken anything yet
>  in my testing (add/update with ftp and http):
>

Hi,

This Diff failed to apply.



Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: PackageRepository.pm
|===================================================================
|RCS file: 
/data/cvsroot/open/anoncvs/cvs/src/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm,v
|retrieving revision 1.62
|diff -u -p -r1.62 PackageRepository.pm
|--- PackageRepository.pm        2 Feb 2009 20:41:47 -0000       1.62
|+++ PackageRepository.pm        3 Feb 2009 10:54:24 -0000
--------------------------
Patching file PackageRepository.pm using Plan A...
Hunk #1 failed at 394.
1 out of 1 hunks failed--saving rejects to PackageRepository.pm.rej
done



# cat PackageRepository.pm.rej
@@ -394,7 +394,7 @@
 {
       my $self = shift;

-       return "//$self->{host}/$self->{path}";
+       return "//$self->{host}$self->{path}";
 }

 sub parse_url
#

What did I do Wrong?

The command I Issued was

# pwd
/usr/src/usr.sbin/pkg_add/OpenBSD
# patch PackageRepository.pm /var/software/patches/PackageRepository.pm


Thanks

Siju



>  Index: PackageRepository.pm
>  ===================================================================
>  RCS file: 
> /data/cvsroot/open/anoncvs/cvs/src/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm,v
>  retrieving revision 1.62
>  diff -u -p -r1.62 PackageRepository.pm
>  --- PackageRepository.pm        2 Feb 2009 20:41:47 -0000       1.62
>  +++ PackageRepository.pm        3 Feb 2009 10:54:24 -0000
>  @@ -394,7 +394,7 @@ sub baseurl
>   {
>         my $self = shift;
>
>  -       return "//$self->{host}/$self->{path}";
>  +       return "//$self->{host}$self->{path}";
>   }
>
>   sub parse_url