Browse Source

fix path computation for relative urls

master
Michael van Elst 23 years ago committed by Ralf S. Engelschall
parent
commit
29c4e92533
  1. 9
      openpkg-tool/openpkg-build.pl
  2. 4
      openpkg-tool/openpkg-tool.spec

9
openpkg-tool/openpkg-build.pl

@ -618,15 +618,12 @@ sub relurl ($$$) {
} else { } else {
if (defined $fn) { if (defined $fn) {
$subfn = $fn; $subfn = $fn;
$subfn =~ s/\/[^\/]*$//; $subfn =~ s/(\/)?\/*[^\/]*$/$1$suburl/;
$subfn .= '/' unless $subfn =~ /\/$/;
$subfn .= $suburl;
$suburl = $subfn; $suburl = $subfn;
} else { } else {
$subfn = $url; $subfn = $url;
$subfn =~ s/\/[^\/]*$//; $subfn =~ s/(\/)?\/*[^\/]*$/$1$suburl/;
$subfn .= '/' unless $subfn =~ /\/$/; $suburl = $subfn;
$suburl = "$subfn$suburl";
$subfn = undef; $subfn = undef;
} }
} }

4
openpkg-tool/openpkg-tool.spec

@ -32,8 +32,8 @@ Packager: The OpenPKG Project
Distribution: OpenPKG [PLUS] Distribution: OpenPKG [PLUS]
Group: Bootstrapping Group: Bootstrapping
License: GPL License: GPL
Version: 20030228 Version: 20030303
Release: 20030228 Release: 20030303
# list of sources # list of sources
Source0: openpkg.sh Source0: openpkg.sh

Loading…
Cancel
Save