Skip to content

Commit

Permalink
Merge pull request #22 from regro-cf-autotick-bot/0.52.0_h809470
Browse files Browse the repository at this point in the history
flux-core v0.52.0
  • Loading branch information
jan-janssen authored Jul 7, 2023
2 parents 37a8165 + 829d9c1 commit a2639cf
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 22 deletions.
14 changes: 7 additions & 7 deletions recipe/centos6.patch
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ index eeeb2c581..79747091d 100644
}

diff --git a/src/cmd/flux-job.c b/src/cmd/flux-job.c
index 979c7fbf7..2eb7c7a8b 100644
index bbbee11ee68..719a165322c 100644
--- a/src/cmd/flux-job.c
+++ b/src/cmd/flux-job.c
@@ -1672,9 +1672,12 @@ static void handle_output_data (struct attach_ctx *ctx, json_t *context)
@@ -1660,9 +1660,12 @@ static void handle_output_data (struct attach_ctx *ctx, json_t *context)
else
fp = stderr;
if (len > 0) {
Expand All @@ -72,17 +72,17 @@ index 979c7fbf7..2eb7c7a8b 100644
+ rc = fwrite (data, len, 1, fp);
+ (void) rc;
+
fflush (fp);
}
free (data);
@@ -2205,7 +2208,9 @@ void handle_exec_log_msg (struct attach_ctx *ctx, double ts, json_t *context)
/* If attached to a pty, terminal is in raw mode so a carriage
* return will be necessary to return cursor to the start of line.
*/
@@ -2217,7 +2220,9 @@ void handle_exec_log_msg (struct attach_ctx *ctx, double ts, json_t *context)
rank,
stream);
}
- fwrite (data, len, 1, stderr);
+ int rc = fwrite (data, len, 1, stderr);
+ (void) rc;
+
+
}

static struct idset *all_taskids (const struct taskmap *map)
Expand Down
5 changes: 2 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
{% set name = "flux-core" %}
{% set version = "0.51.0" %}
{% set version = "0.52.0" %}

package:
name: {{ name|lower }}
version: {{ version }}

source:
url: https://github.com/flux-framework/flux-core/releases/download/v{{ version }}/flux-core-{{ version }}.tar.gz
sha256: e57b71b708482f20d2a2195a000c0c3b9176faa6aaadfad4d2117f8671ca67ce
sha256: dca434238405e4cae4686c8143f2cc79919bfd9e26b09c980e1e5f69ffd0c448
patches:
- centos6.patch # This patch can be removed once the conda-forge reference is updated
- signal.patch

build:
number: 0
Expand Down
12 changes: 0 additions & 12 deletions recipe/signal.patch

This file was deleted.

0 comments on commit a2639cf

Please sign in to comment.