OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-tools                    Date:   25-Jul-2004 12:40:54
  Branch: HEAD                             Handle: 2004072511405300

  Modified files:
    openpkg-tools/cmd       build.pl

  Log:
    fix 'openpkg makeproxy' command

  Summary:
    Revision    Changes     Path
    1.6         +3  -2      openpkg-tools/cmd/build.pl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-tools/cmd/build.pl
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 build.pl
  --- openpkg-tools/cmd/build.pl        25 Jul 2004 09:50:32 -0000      1.5
  +++ openpkg-tools/cmd/build.pl        25 Jul 2004 10:40:53 -0000      1.6
  @@ -162,6 +162,7 @@
       ((-f "$l_prefix/bin/openpkg" && -f "$l_prefix/libexec/openpkg/rpm") ?
       "$l_prefix/bin/openpkg rpm" : "$l_prefix/bin/rpm");
   $RPM = (`which $RPM` =~ m{^(/.*)})[0] if ($RPM !~ m|^/|);
  +$MKP = "$l_prefix/bin/openpkg makeproxy";
   die "FATAL: cannot locate rpm in path\n" unless $RPM =~ m{^/};
   
   # augment command line parameters
  @@ -2214,10 +2215,10 @@
                   #
                   # rpm doesn't support additional parameters to the
                   # mkproxy script
  -                # $cmd1 = npriv("$RPM$opt --makeproxy $ppkg -- -o $bpkg");
  +                # $cmd1 = npriv("$MKP $ppkg -- -o $bpkg");
                   #
                   $cmd1 = "( cd $c->{rpmdir} && ".
  -                        npriv("$RPM$opt --makeproxy $ppkg").
  +                        npriv("$MKP $ppkg").
                           " )";
               } elsif (defined $_->{prefix}) {
                   $cmd1 = npriv("$CURL -q -s -o $bpkg $spkg");
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to