refresh

diff --git a/meta b/meta
index b8c8c3dadbc7ef27d2677fae2ab3a78ab2a29b72..44a7dd7031475046be04abb422af220ec43abd6d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: ec42b37a5f4ce80fdd7adae33eca3993547c403d
-Head: 745ff37619d08562932180e01f9cfe2c51c8bf9d
+Previous: 6f91acf00617e1531f2e17078a3d83047b1865f2
+Head: e80610b96c0f5c0c18e8b3361e5890e82863ec32
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -9,8 +9,7 @@ Applied:
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: 558e5577364aec3531c54b28def6e16f0c926524
-  verbose: e8d666cc68126a0443e740fa4db9e44455f5dbfd
-  refresh-temp: 745ff37619d08562932180e01f9cfe2c51c8bf9d
+  verbose: e80610b96c0f5c0c18e8b3361e5890e82863ec32
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e8a4b97..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 8136268bd77c0eb86ebc719e7c2e7631c4e05b2b
-Top:    4bccca2454ae52dbf3c0da725b1e2c636ef30617
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-03 14:02:20 -0800
-
-Refresh of verbose
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 655c318..cc34577 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -602,6 +602,7 @@ int CDECL_FUNC main(int argc, char **argv)
-               ret = gen_opts();
- 
- out:
--      VPRINT("return status 0x%x\n", ret);
-+      if (verbose || !(make_addr || make_opts) || ret)
-+              printf("return status 0x%x\n", ret);
-       return ret;
- }

diff --git a/patches/verbose b/patches/verbose
index 3f55effd4340a2cc06b5717866e20812681ea514..6c57043885d34db1095c8a8cad1e3980b344cf99 100644 (file)
--- a/patches/verbose
+++ b/patches/verbose
@@ -1,5 +1,5 @@
 Bottom: 2895e38b888c2de8c2681ec086046cb241282cc2
-Top:    8136268bd77c0eb86ebc719e7c2e7631c4e05b2b
+Top:    4bccca2454ae52dbf3c0da725b1e2c636ef30617
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-03 12:52:49 -0800
 
@@ -39,7 +39,7 @@ index 2cb422a..9477d29 100644
        }
        ret = 0;
 diff --git a/src/acme.c b/src/acme.c
-index 552f42a..655c318 100644
+index 552f42a..cc34577 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -53,12 +53,15 @@ static char addr_type = 'i';
@@ -121,12 +121,13 @@ index 552f42a..655c318 100644
                default:
                        show_usage(argv[0]);
                        exit(1);
-@@ -595,6 +602,6 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -595,6 +602,7 @@ int CDECL_FUNC main(int argc, char **argv)
                ret = gen_opts();
  
  out:
 -      printf("return status 0x%x\n", ret);
-+      VPRINT("return status 0x%x\n", ret);
++      if (verbose || !(make_addr || make_opts) || ret)
++              printf("return status 0x%x\n", ret);
        return ret;
  }
 diff --git a/windows/acme_windows.c b/windows/acme_windows.c