← Back to branch summary

~ubuntu-branches/ubuntu/vivid/cctools/vivid

« back to all changes in this revision

Viewing changes to debian/patches/parrot_run_hang_fix

  • Committer: Package Import Robot
  • Author(s): Michael Hanke
  • Date: 2012-06-30 11:35:24 UTC
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: package-import@ubuntu.com-20120630113524-r15b9x15akadwkm7
http://bugs.debian.org/678417
Apply upstream patch to address parrot_run stalling on Debian wheezy and
later (Closes: #678417).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/parrot_run_hang_fix
 
1
diff --git a/parrot/src/tracer.c b/parrot/src/tracer.c
 
2
index 140057d..0c15278 100644
 
3
--- a/parrot/src/tracer.c
 
4
+++ b/parrot/src/tracer.c
 
5
@@ -300,7 +300,7 @@ int tracer_copy_out( struct tracer *t, const void *data, const void *uaddr, int
 
6
 
 
7
        if(has_fast_write) {
 
8
                result = full_pwrite64(t->memory_file,data,length,iuaddr);
 
9
-               if( result!=length && errno==EINVAL ) {
 
10
+               if( result!=length ) {
 
11
                        has_fast_write = 0;
 
12
                        debug(D_SYSCALL,"writing to /proc/X/mem failed, falling back to slow ptrace write");
 
13
                } else {