Problems running pkgdb -fF

[Sergey Matveychuk]

Andrew Pantyukhin wrote:
> On 3/19/07, Joe Marcus Clarke <marcus at marcuscom.com> wrote:
>> Running pkgdb -Ff today gives me the following error:
> 
> Just a "me too" here, and this problem appears during
> portupgrade runs, too.
> 

Try the patch please. I could not find a box where I can reproduce the
error, so it's not tested. Just a obvious quick fix.

Index: pkgtools.rb
===================================================================
RCS file: /cvsroot/portupgrade/pkgtools/lib/pkgtools.rb,v
retrieving revision 1.16.2.4
diff -u -r1.16.2.4 pkgtools.rb
--- pkgtools.rb 27 Feb 2007 11:34:59 -0000      1.16.2.4
+++ pkgtools.rb 20 Mar 2007 17:18:35 -0000
@@ -790,8 +790,7 @@
   contents_file = $pkgdb.pkg_contents(pkgname)

   if grep_q_file(/^@comment[ \t]+ORIGIN:/, contents_file)
-    command = shelljoin('sed',
-                       "s|^\\(@comment[ \t][
\t]*ORIGIN:\\).*$|\\1#{origin}|")
+    command = "sed s|^\\(@comment[ \t][ \t]*ORIGIN:\\).*$|\\1#{origin}|"
   else
     command = "(cat; echo '@comment ORIGIN:#{origin}')"
   end


-- 
Dixi.
Sem.