Sfoglia il codice sorgente

Use subshell in target directory instead of forwarded option

Michael van Elst 23 anni fa
parent
commit
eab1ff0e4a
2 ha cambiato i file con 8 aggiunte e 3 eliminazioni
  1. 6 1
      openpkg-tool/openpkg-build.pl
  2. 2 2
      openpkg-tool/openpkg-tool.spec

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

@@ -1254,7 +1254,12 @@ sub print_list1 ($$$@$) {
             if ($_->{PROXY}) {
                 $ppkg = find_proxy($_,$bpkg) or
                 die "FATAL: proxy package ",vsn($_)," does not exist\n";
-                $cmd1 = "$RPM_NPRIV$opt --makeproxy -o $bpkg $ppkg";
+                #
+                # rpm doesn't support additional parameters to the
+                # mkproxy script
+                # $cmd1 = "$RPM_NPRIV$opt --makeproxy $ppkg -- -o $bpkg";
+                #
+                $cmd1 = "( cd $c->{rpmdir} && $RPM_NPRIV$opt --makeproxy $ppkg )";
             } elsif (defined $_->{platform}) {
                 $cmd1 = "$CURL -q -s -o $bpkg $spkg";
             } else {

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

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