OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 03-Mar-2003 16:00:15 Branch: HEAD Handle: 2003030315000008 Modified files: openpkg-src/openpkg-tool openpkg-build.pl openpkg-tool.spec openpkg-web news.txt Log: fix path computation for relative urls Summary: Revision Changes Path 1.58 +3 -6 openpkg-src/openpkg-tool/openpkg-build.pl 1.41 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec 1.3515 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg-tool/openpkg-build.pl ============================================================================ $ cvs diff -u -r1.57 -r1.58 openpkg-build.pl --- openpkg-src/openpkg-tool/openpkg-build.pl 20 Feb 2003 09:24:27 -0000 1.57 +++ openpkg-src/openpkg-tool/openpkg-build.pl 3 Mar 2003 15:00:06 -0000 1.58 @@ -618,15 +618,12 @@ } else { if (defined $fn) { $subfn = $fn; - $subfn =~ s/\/[^\/]*$//; - $subfn .= '/' unless $subfn =~ /\/$/; - $subfn .= $suburl; + $subfn =~ s/(\/)?\/*[^\/]*$/$1$suburl/; $suburl = $subfn; } else { $subfn = $url; - $subfn =~ s/\/[^\/]*$//; - $subfn .= '/' unless $subfn =~ /\/$/; - $suburl = "$subfn$suburl"; + $subfn =~ s/(\/)?\/*[^\/]*$/$1$suburl/; + $suburl = $subfn; $subfn = undef; } } @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg-tool/openpkg-tool.spec ============================================================================ $ cvs diff -u -r1.40 -r1.41 openpkg-tool.spec --- openpkg-src/openpkg-tool/openpkg-tool.spec 28 Feb 2003 14:22:09 -0000 1.40 +++ openpkg-src/openpkg-tool/openpkg-tool.spec 3 Mar 2003 15:00:08 -0000 1.41 @@ -32,8 +32,8 @@ Distribution: OpenPKG [PLUS] Group: Bootstrapping License: GPL -Version: 20030228 -Release: 20030228 +Version: 20030303 +Release: 20030303 # list of sources Source0: openpkg.sh @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.3514 -r1.3515 news.txt --- openpkg-web/news.txt 3 Mar 2003 11:04:04 -0000 1.3514 +++ openpkg-web/news.txt 3 Mar 2003 15:00:00 -0000 1.3515 @@ -1,3 +1,4 @@ +03-Mär-2003: Upgraded package: P<openpkg-tool-20030303-20030303> 03-Mar-2003: Upgraded package: P<tidy-20030302-20030303> 03-Mar-2003: Upgraded package: P<postfix-2.0.4-20030303> 03-Mar-2003: Upgraded package: P<libtasn1-0.2.2-20030303> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]