~ubuntu-branches/ubuntu/trusty/golang/trusty

« back to all changes in this revision

Viewing changes to src/pkg/os/exec_unix.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-20 14:06:23 UTC
  • mfrom: (14.1.23 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130820140623-b414jfxi3m0qkmrq
Tags: 2:1.1.2-2ubuntu1
* Merge from Debian unstable (LP: #1211749, #1202027). Remaining changes:
  - 016-armhf-elf-header.patch: Use correct ELF header for armhf binaries.
  - d/control,control.cross: Update Breaks/Replaces for Ubuntu
    versions to ensure smooth upgrades, regenerate control file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
                return nil, NewSyscallError("wait", e)
25
25
        }
26
26
        if pid1 != 0 {
27
 
                p.done = true
 
27
                p.setDone()
28
28
        }
29
29
        ps = &ProcessState{
30
30
                pid:    pid1,
35
35
}
36
36
 
37
37
func (p *Process) signal(sig Signal) error {
38
 
        if p.done {
 
38
        if p.done() {
39
39
                return errors.New("os: process already finished")
40
40
        }
41
41
        s, ok := sig.(syscall.Signal)