pop

diff --git a/meta b/meta
index 41fc42f5e0f2cb933452356cff564a9956654cbc..8a2b36698b0c9a6f22d3b5610690e2ba92f9630d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 00a676a077c915c9aae1b94e6910f14f95b6cfa9
-Head: dcd994c9e3d610f447e676429a394a496b83a2d6
+Previous: eb7f350fba6ebb97c90de37547c890a7935bd7e2
+Head: 27d4ad91c8cd8c6c20ba7c3ac0db555e1c4df96b
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   fstat: dcd994c9e3d610f447e676429a394a496b83a2d6
+  dbg-out: 27d4ad91c8cd8c6c20ba7c3ac0db555e1c4df96b
 Unapplied:
-  dbg-out: 332b5e4db811019600b165f03de1cd0326c94952
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg-out b/patches/dbg-out
index 8450d82a6cc07bde58c659ef535303cd6045f9de..b8b449c5e01120e9dd72a8ebfb3b1b0fb32dbc4b 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
-Bottom: 799d9bfcd5b6545c40e5e19c7b50907bd25ed616
-Top:    1db36b1ec8bc6cb382c9b444bf6057015721abf3
+Bottom: 7bf18695fef78ce1cf020b98bda96e2687917519
+Top:    7cce5cae5d42cd31d7c3833ac60d0668c0c1d6d5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 11:08:30 -0700
 
@@ -9,7 +9,7 @@ support for debug prints
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 749857e..3e524b4 100644
+index 33eb9a3..d1b6cff 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -37,7 +37,7 @@ index 749857e..3e524b4 100644
        getenv_options();
        init = 1;
  out:
-@@ -963,16 +967,21 @@ int dup2(int oldfd, int newfd)
+@@ -964,16 +968,21 @@ int dup2(int oldfd, int newfd)
        return newfd;
  }