Hello community, here is the log from the commit of package blogc for openSUSE:Factory checked in at 2018-05-16 11:41:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blogc (Old) and /work/SRC/openSUSE:Factory/.blogc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blogc" Wed May 16 11:41:00 2018 rev:6 rq:607422 version:0.13.6 Changes: -------- --- /work/SRC/openSUSE:Factory/blogc/blogc.changes 2018-05-15 10:34:11.330454210 +0200 +++ /work/SRC/openSUSE:Factory/.blogc.new/blogc.changes 2018-05-16 11:42:26.858433889 +0200 @@ -1,0 +2,7 @@ +Tue May 15 08:53:53 UTC 2018 - [email protected] + +- Update to 0.13.6: + * Improved blogc-make(1) output formatting when running the + runserver helper rule. + +------------------------------------------------------------------- Old: ---- blogc-0.13.5.tar.xz New: ---- blogc-0.13.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blogc.spec ++++++ --- /var/tmp/diff_new_pack.DGZHFR/_old 2018-05-16 11:42:27.586407394 +0200 +++ /var/tmp/diff_new_pack.DGZHFR/_new 2018-05-16 11:42:27.598406957 +0200 @@ -17,7 +17,7 @@ Name: blogc -Version: 0.13.5 +Version: 0.13.6 Release: 0 Summary: Blog compiler License: BSD-3-Clause ++++++ blogc-0.13.5.tar.xz -> blogc-0.13.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.13.5/.tarball-version new/blogc-0.13.6/.tarball-version --- old/blogc-0.13.5/.tarball-version 2018-05-14 01:45:09.000000000 +0200 +++ new/blogc-0.13.6/.tarball-version 2018-05-14 22:53:09.000000000 +0200 @@ -1 +1 @@ -0.13.5 +0.13.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.13.5/.version new/blogc-0.13.6/.version --- old/blogc-0.13.5/.version 2018-05-14 01:45:08.000000000 +0200 +++ new/blogc-0.13.6/.version 2018-05-14 22:53:08.000000000 +0200 @@ -1 +1 @@ -0.13.5 +0.13.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.13.5/blogc.spec new/blogc-0.13.6/blogc.spec --- old/blogc-0.13.5/blogc.spec 2018-05-14 01:45:07.000000000 +0200 +++ new/blogc-0.13.6/blogc.spec 2018-05-14 22:53:07.000000000 +0200 @@ -1,11 +1,11 @@ Name: blogc -Version: 0.13.5 +Version: 0.13.6 Release: 1%{?dist} License: BSD Group: Applications/Text Summary: A blog compiler URL: https://blogc.rgm.io/ -Source0: https://github.com/blogc/blogc/releases/download/v0.13.5/blogc-0.13.5.tar.xz +Source0: https://github.com/blogc/blogc/releases/download/v0.13.6/blogc-0.13.6.tar.xz BuildRequires: libcmocka-devel, bash, coreutils, diffutils %if ! 0%{?el6} BuildRequires: git, tar, make @@ -43,7 +43,7 @@ blogc-runserver is a simple HTTP server to test blogc websites. %prep -%setup -q -n blogc-0.13.5 +%setup -q -n blogc-0.13.6 %build %if 0%{?el6} @@ -88,6 +88,9 @@ %license LICENSE %changelog +* Mon May 14 2018 Rafael G. Martins <[email protected]> 0.13.6-1 +- New release. + * Sun May 13 2018 Rafael G. Martins <[email protected]> 0.13.5-1 - New release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.13.5/blogc.spec.in new/blogc-0.13.6/blogc.spec.in --- old/blogc-0.13.5/blogc.spec.in 2018-05-14 01:44:34.000000000 +0200 +++ new/blogc-0.13.6/blogc.spec.in 2018-05-14 22:52:33.000000000 +0200 @@ -88,6 +88,9 @@ %license LICENSE %changelog +* Mon May 14 2018 Rafael G. Martins <[email protected]> 0.13.6-1 +- New release. + * Sun May 13 2018 Rafael G. Martins <[email protected]> 0.13.5-1 - New release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.13.5/configure new/blogc-0.13.6/configure --- old/blogc-0.13.5/configure 2018-05-14 01:45:03.000000000 +0200 +++ new/blogc-0.13.6/configure 2018-05-14 22:53:03.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for blogc 0.13.5. +# Generated by GNU Autoconf 2.69 for blogc 0.13.6. # # Report bugs to <https://github.com/blogc/blogc>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='blogc' PACKAGE_TARNAME='blogc' -PACKAGE_VERSION='0.13.5' -PACKAGE_STRING='blogc 0.13.5' +PACKAGE_VERSION='0.13.6' +PACKAGE_STRING='blogc 0.13.6' PACKAGE_BUGREPORT='https://github.com/blogc/blogc' PACKAGE_URL='https://blogc.rgm.io/' @@ -1375,7 +1375,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures blogc 0.13.5 to adapt to many kinds of systems. +\`configure' configures blogc 0.13.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1445,7 +1445,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of blogc 0.13.5:";; + short | recursive ) echo "Configuration of blogc 0.13.6:";; esac cat <<\_ACEOF @@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -blogc configure 0.13.5 +blogc configure 0.13.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1941,7 +1941,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by blogc $as_me 0.13.5, which was +It was created by blogc $as_me 0.13.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2806,7 +2806,7 @@ # Define the identity of the package. PACKAGE='blogc' - VERSION='0.13.5' + VERSION='0.13.6' cat >>confdefs.h <<_ACEOF @@ -14934,7 +14934,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by blogc $as_me 0.13.5, which was +This file was extended by blogc $as_me 0.13.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15001,7 +15001,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -blogc config.status 0.13.5 +blogc config.status 0.13.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.13.5/src/blogc-make/exec.c new/blogc-0.13.6/src/blogc-make/exec.c --- old/blogc-0.13.5/src/blogc-make/exec.c 2018-05-14 01:44:34.000000000 +0200 +++ new/blogc-0.13.6/src/blogc-make/exec.c 2018-05-14 22:52:33.000000000 +0200 @@ -308,10 +308,6 @@ int rv = bm_exec_command(cmd, input->str, &out, &err, &error); - if (err != NULL) { - fprintf(stderr, "%s", err); - } - if (error != NULL) { bc_error_print(error, "blogc-make"); free(cmd); @@ -322,35 +318,36 @@ return 3; } - if (rv != 0) { - if (ctx->verbose) { - fprintf(stderr, - "blogc-make: error: Failed to execute command.\n" - "\n" - "STATUS CODE: %d\n", rv); - if (input->len > 0) { - fprintf(stderr, "\nSTDIN:\n" - "----------------------------->8-----------------------------\n" - "%s\n" - "----------------------------->8-----------------------------\n", - bc_str_strip(input->str)); - } - if (out != NULL) { - fprintf(stderr, "\nSTDOUT:\n" - "----------------------------->8-----------------------------\n" - "%s\n" - "----------------------------->8-----------------------------\n", - bc_str_strip(out)); - } + if (rv != 0 && ctx->verbose) { + fprintf(stderr, + "blogc-make: error: Failed to execute command.\n" + "\n" + "STATUS CODE: %d\n", rv); + if (input->len > 0) { + fprintf(stderr, "\nSTDIN:\n" + "----------------------------->8-----------------------------\n" + "%s\n" + "----------------------------->8-----------------------------\n", + bc_str_strip(input->str)); } - else { - fprintf(stderr, - "blogc-make: error: Failed to execute command (%d)", rv); - if (err != NULL) { - fprintf(stderr, ":\n%s", bc_str_strip(err)); - } - fprintf(stderr, "\n"); + if (out != NULL) { + fprintf(stderr, "\nSTDOUT:\n" + "----------------------------->8-----------------------------\n" + "%s\n" + "----------------------------->8-----------------------------\n", + bc_str_strip(out)); } + if (err != NULL) { + fprintf(stderr, "\nSTDERR:\n" + "----------------------------->8-----------------------------\n" + "%s\n" + "----------------------------->8-----------------------------\n", + bc_str_strip(err)); + } + fprintf(stderr, "\n"); + } + else if (err != NULL) { + fprintf(stderr, "%s\n", err); } bc_string_free(input, true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.13.5/src/blogc-make/httpd.c new/blogc-0.13.6/src/blogc-make/httpd.c --- old/blogc-0.13.5/src/blogc-make/httpd.c 2018-05-14 01:44:34.000000000 +0200 +++ new/blogc-0.13.6/src/blogc-make/httpd.c 2018-05-14 22:52:33.000000000 +0200 @@ -10,6 +10,7 @@ #include <stdlib.h> #include <string.h> #include <pthread.h> +#include <unistd.h> #include "../common/utils.h" #include "ctx.h" #include "exec.h" @@ -47,6 +48,17 @@ bm_httpd_run(bm_ctx_t **ctx, bm_rule_exec_func_t rule_exec, bc_slist_t *outputs, bc_trie_t *args) { + // this is here to avoid that the httpd starts running in the middle of the + // first build, as the reloader and the httpd are started in parallel. + // we run the task synchronously for the first time, and start the httpd + // thread afterwards. + bool wait_before_reloader = false; + if (0 != rule_exec(*ctx, outputs, args)) { + fprintf(stderr, "blogc-make: warning: failed to rebuild website. " + "retrying in 5 seconds ...\n\n"); + wait_before_reloader = true; + } + int err; pthread_attr_t attr; @@ -77,5 +89,8 @@ } // run the reloader + if (wait_before_reloader) { + sleep(5); + } return bm_reloader_run(ctx, rule_exec, outputs, args); }
