refresh (create temporary patch)

diff --git a/meta b/meta
index 14f76f26082a55a18fe1911cda2888b0a12ec380..4a3968eebdd029ef9709758f4517294198eee060 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 22b1f75780155d023f1864689c9c83b7847ae35a
-Head: 558e5577364aec3531c54b28def6e16f0c926524
+Previous: f3ecc51a285f285c2fe4d555df2267e58e790f28
+Head: 691f52616b409f595530f781a842bff22f1eda84
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -9,6 +9,7 @@ Applied:
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: 558e5577364aec3531c54b28def6e16f0c926524
+  refresh-temp: 691f52616b409f595530f781a842bff22f1eda84
 Unapplied:
   verbose: 572c8094123639a268eb1cbb92f7947ffbdd406b
   dbg_1: 3258ebd9b3f17653231089184f29ee2352be9d46

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..9961925
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,25 @@
+Bottom: 2895e38b888c2de8c2681ec086046cb241282cc2
+Top:    b4a0745eb9fbe073654d6057445a51e490d3711d
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-12-08 11:48:06 -0800
+
+Refresh of locking
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index a680b0b..bda18b5 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -2731,6 +2731,11 @@ static int acm_open_lock_file(void)
+       if (lock_fd < 0)
+               return lock_fd;
+ 
++      if (lockf(lock_fd, F_TLOCK, 0)) {
++              close(lock_fd);
++              return -1;
++      }
++
+       sprintf(pid, "%d\n", getpid());
+       write(lock_fd, pid, strlen(pid));
+       return 0;