refresh

diff --git a/meta b/meta
index 04cea479ebe06ef7aa2649761143e308277a281b..5bb1ea2383762b2ad424fdbb0fe056bd93e5bb75 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 7792e84a1e41bb5bad24de642304df245eace0d8
-Head: 663fe7894356dc0601972f2d42c6c2b726d6428d
+Previous: 8cf9e58bfbcc049f2721e7352e1f354c71be0817
+Head: 33b72f8f05020415262a067e2f11afff172af534
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -11,8 +11,7 @@ Applied:
   locking: 558e5577364aec3531c54b28def6e16f0c926524
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
-  no_addr: 7bea6bc2d2183b000b6f30518787bcc585756128
-  refresh-temp: 663fe7894356dc0601972f2d42c6c2b726d6428d
+  no_addr: 33b72f8f05020415262a067e2f11afff172af534
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/no_addr b/patches/no_addr
index ecc387940e06547eff620bc0338f307045d945ad..5aa5701c9d22a96580606e5e63057405cd58af57 100644 (file)
--- a/patches/no_addr
+++ b/patches/no_addr
@@ -1,5 +1,5 @@
 Bottom: 5e7b11ab34ad911d8a6551337d36c51be1b092b4
-Top:    c2070b7b82944dcc5fbd4c3e2f8594004721c60f
+Top:    731f7fad19300220b8a2942d713e13875fa93fbd
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:06:47 -0800
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 9ff81c4..3a8e9df 100644
+index 9ff81c4..cfb60a4 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -203,6 +203,7 @@ static SOCKET listen_socket;
@@ -76,7 +76,7 @@ index 9ff81c4..3a8e9df 100644
        DListInit(&timeout_list);
        event_init(&timeout_event);
  
-+      if (faddr = acm_open_addr_file()) {
++      if ((faddr = acm_open_addr_file())) {
 +              acm_log(0, "ERROR - address file not found\n");
 +              return -1
 +      }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 53aa8da..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: c2070b7b82944dcc5fbd4c3e2f8594004721c60f
-Top:    731f7fad19300220b8a2942d713e13875fa93fbd
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 11:32:42 -0800
-
-Refresh of no_addr
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 3a8e9df..cfb60a4 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2825,7 +2825,7 @@ int CDECL_FUNC main(int argc, char **argv)
-       DListInit(&timeout_list);
-       event_init(&timeout_event);
- 
--      if (faddr = acm_open_addr_file()) {
-+      if ((faddr = acm_open_addr_file())) {
-               acm_log(0, "ERROR - address file not found\n");
-               return -1
-       }