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 Date: 24-Jan-2003 14:46:55 Branch: HEAD Handle: 2003012413465400 Modified files: openpkg-src/openpkg-tool openpkg-build.pl Log: Fix option handling Summary: Revision Changes Path 1.45 +2 -2 openpkg-src/openpkg-tool/openpkg-build.pl ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg-tool/openpkg-build.pl ============================================================================ $ cvs diff -u -r1.44 -r1.45 openpkg-build.pl --- openpkg-src/openpkg-tool/openpkg-build.pl 24 Jan 2003 09:57:54 -0000 1.44 +++ openpkg-src/openpkg-tool/openpkg-build.pl 24 Jan 2003 13:46:54 -0000 1.45 @@ -308,7 +308,7 @@ # if (($pre,$with) = $nam =~ /^(\S+?)::(\S*)$/) { $val =~ s/(?:\%([0-9a-fA-F][0-9a-fA-F]))/chr(hex($1))/eg; - ($ver,$rel,$pxy) = ($val, '', undef); + ($ver,$rel,$pxy) = ($val, undef, undef); } else { ($ver,$rel,$pxy) = $val =~ /^([^\s\-]+)-([^\s\+]+)(\+PROXY)?$/; } @@ -436,7 +436,7 @@ $options{$p->{prefix}}->{$p->{with}} = $p->{version} } - push @{$map{$p->{name}}->{"$p->{version}-$p->{release}"}}, { + push @{$map{$p->{name}}->{vs($p)}}, { name => $p->{name}, version => (defined $p->{version} ? $p->{version} : '*'), release => (defined $p->{release} ? $p->{release} : '*'), @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]