refresh

diff --git a/meta b/meta
index 79a8653b31e7488caa032a590a908c39ab0879f3..77b8d9bbd40027426bf7024cb04bce6292b92ea3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 643321f7aaf82a6b1a153d407e3312ff4c47fb72
-Head: f4bbae8e8d8d4454eb203ec096beb32dd0f812b4
+Previous: dc3e1509ac8b05cba7d08d94e1f4c88b4c4a48dd
+Head: 4d7174e927130db17a5ff83f9279ea4c54fde2fa
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -11,8 +11,7 @@ Applied:
   locking: 558e5577364aec3531c54b28def6e16f0c926524
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
-  no_addr: edc6fadc150ebff8f907cecbcaac6e9ff37abc9f
-  refresh-temp: f4bbae8e8d8d4454eb203ec096beb32dd0f812b4
+  no_addr: 4d7174e927130db17a5ff83f9279ea4c54fde2fa
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/no_addr b/patches/no_addr
index 4e182e2675a5dbdb0f7421a4d5d6965d2cf6aae2..e1e4124a91ce3ee294d0054685650a1c081eff1c 100644 (file)
--- a/patches/no_addr
+++ b/patches/no_addr
@@ -1,5 +1,5 @@
 Bottom: 5e7b11ab34ad911d8a6551337d36c51be1b092b4
-Top:    1677bd6e63e9a673f9651e2fec6fbb09dcb646ce
+Top:    c74c104f2280f5a29202ce1d4dec0a24004cece3
 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..c7e2768 100644
+index 9ff81c4..aa26fc5 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -203,6 +203,7 @@ static SOCKET listen_socket;
@@ -86,7 +86,7 @@ index 9ff81c4..c7e2768 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 c4f82ba..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 1677bd6e63e9a673f9651e2fec6fbb09dcb646ce
-Top:    c74c104f2280f5a29202ce1d4dec0a24004cece3
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 11:37:59 -0800
-
-Refresh of no_addr
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index c7e2768..aa26fc5 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2824,7 +2824,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;
-       }