<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "http://bugs.gentoo.org/bugzilla.dtd">

<bugzilla version="2.22.7"
          urlbase="http://bugs.gentoo.org/"
          maintainer="bugzilla@gentoo.org"
>

    <bug>
          <bug_id>11728</bug_id>
          
          <creation_ts>2002-12-07 11:29 0000</creation_ts>
          <short_desc>etc-update error during interactive merge</short_desc>
          <delta_ts>2003-12-27 00:15:12 0000</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>Portage Development</product>
          <component>Unclassified (old)</component>
          <version>unspecified</version>
          <rep_platform>x86</rep_platform>
          <op_sys>Linux</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          
          <priority>P2</priority>
          <bug_severity>normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          
          <everconfirmed>1</everconfirmed>
          <reporter>ian@ianbrandt.com</reporter>
          <assigned_to>azarah@gentoo.org</assigned_to>
          <cc>converter42@gmail.com</cc>
    
    <cc>mholzer@gentoo.org</cc>
    
    <cc>tobler_pc@gmx.net</cc>

      

      
          <long_desc isprivate="0">
            <who>ian@ianbrandt.com</who>
            <bug_when>2002-12-07 11:29:33 0000</bug_when>
            <thetext>Whenever I finish the last diff in an interactive merge during etc-update it 
prints

%r
sdiff: subsidiary program `/usr/bin/nano&apos; failed
1) Replace /etc/make.conf with merged file

This doesn&apos;t seem to actually effect anything, and I can run /usr/bin/nano just 
fine.</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>kyonos@yahoo.com</who>
            <bug_when>2002-12-10 23:58:12 0000</bug_when>
            <thetext>I am having the same error:
  
 1. I re-installed nano, still the same outcome
 2. changed EDITOR=/bin/nano, outcome is the same.
 3. re-install lintool, same outcome

All this after a rsync and emerge -u world. </thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>converter42@gmail.com</who>
            <bug_when>2003-01-08 03:27:29 0000</bug_when>
            <thetext>Created an attachment (id=7084)
patch to sdiff.c, removes waitpid() call after pclose() on piped diff stream

sdiff calls waitpid() after pclose() on the piped diff process stream. As I
read the pclose() documentation, pclose() waits for the child, so an explicit
waitpid() call after pclose() is probably returning -1 and setting errno to
ECHILD (just a guess).
</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>liviu.voicu@gmail.com</who>
            <bug_when>2003-01-10 04:43:02 0000</bug_when>
            <thetext>Worked, I suggest to gentoo team to add the patch to the diffutils :-)
This made my day.
Liviu ( D`Artagnan )</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>mholzer@gentoo.org</who>
            <bug_when>2003-01-18 07:50:59 0000</bug_when>
            <thetext>azarah: please add this patch into diffutils</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>azarah@gentoo.org</who>
            <bug_when>2003-01-19 18:47:11 0000</bug_when>
            <thetext>Added to 2.8.4-r2, thanks.
</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>mholzer@gentoo.org</who>
            <bug_when>2003-01-20 15:26:53 0000</bug_when>
            <thetext>works fine

no more error

thx azarah</thetext>
          </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>7084</attachid>
            <date>2003-01-08 03:27 0000</date>
            <desc>patch to sdiff.c, removes waitpid() call after pclose() on piped diff stream</desc>
            <filename>sdiff.c.diff</filename>
            <type>text/plain</type>
            <data encoding="base64">LS0tIHNkaWZmLmMub3JpZwkyMDAyLTA2LTE3IDAwOjU1OjQyLjAwMDAwMDAwMCAtMDUwMAorKysg
c2RpZmYuYwkyMDAzLTAxLTA4IDAzOjA0OjAyLjAwMDAwMDAwMCAtMDYwMApAQCAtNjkyLDcgKzY5
Miw3IEBACiAgICAgICBja19mY2xvc2UgKG91dCk7CiAKICAgICAgIHsKLQlpbnQgd3N0YXR1czsK
KwlpbnQgd3N0YXR1cyA9IDA7CiAJaW50IHdlcnJubyA9IDA7CiAKICNpZiAhIChIQVZFX1dPUktJ
TkdfRk9SSyB8fCBIQVZFX1dPUktJTkdfVkZPUkspCkBAIC03MDEsMTEgKzcwMSw2IEBACiAJICB3
ZXJybm8gPSBlcnJubzsKICNlbHNlCiAJY2tfZmNsb3NlIChkaWZmb3V0KTsKLQl3aGlsZSAod2Fp
dHBpZCAoZGlmZnBpZCwgJndzdGF0dXMsIDApIDwgMCkKLQkgIGlmIChlcnJubyA9PSBFSU5UUikK
LQkgICAgY2hlY2tzaWdzICgpOwotCSAgZWxzZQotCSAgICBwZXJyb3JfZmF0YWwgKCJ3YWl0cGlk
Iik7CiAJZGlmZnBpZCA9IDA7CiAjZW5kaWYKIAo=
</data>        

          </attachment>
    </bug>

</bugzilla>