Explorar o código

SuSE which(1) dislikes to expand already absolute pathnames

Ralf S. Engelschall %!s(int64=23) %!d(string=hai) anos
pai
achega
78adc022f6
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 1 1
      openpkg-tool/openpkg-build.pl
  2. 2 2
      openpkg-tool/openpkg-tool.spec

+ 1 - 1
openpkg-tool/openpkg-build.pl

@@ -157,7 +157,7 @@ sub conditional ($$) {
 my($RPM,$CURL,$PROG);
 
 $RPM = $opt_R || $env{''}->{'R'} || '@l_prefix@/bin/rpm';
-$RPM = (`which $RPM` =~ m{^(/.*)})[0];
+$RPM = (`which $RPM` =~ m{^(/.*)})[0] if ($RPM !~ m|^/|);
 die "FATAL: cannot locate rpm in path\n" unless $RPM =~ m{^/};
 
 # augment command line parameters

+ 2 - 2
openpkg-tool/openpkg-tool.spec

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