diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-05-27 15:11:59 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-05-27 15:33:30 +0300 |
commit | 83d7377354504cf3d92a5bdf9cade07554c6b66e (patch) | |
tree | 01d602910d6314edbd5568600e7dfb5b1b215bfa /src/wydawca.c | |
parent | 5fc301baf79e9cc19b1bc8e7a5940e060611e349 (diff) | |
download | wydawca-83d7377354504cf3d92a5bdf9cade07554c6b66e.tar.gz wydawca-83d7377354504cf3d92a5bdf9cade07554c6b66e.tar.bz2 |
Implement upload directives version 1.2
* NEWS: Update.
* README: Update.
* doc/wydawca.texi: Document changes.
* src/cmdline.opt: Update copyright years.
* src/config.c: Update for new grecs version.
New keywords: min-version and max-version.
* src/directive.c (directive_unpack_version): New function.
(directive_version_in_range_p): Set trp->version and print it.
(directive) <replace_dir>: New directive.
(directive_table): New directive "replace".
(verify_directive_format): Use globals min_directive_version
and max_directive_version.
(process_directives): Handle replace_dir
* src/diskio.c (dir_move_file): Use the "replace"
directive to act on existing files.
* src/wydawca.c (min_directive_version)
(max_directive_version): New globals.
(main): Loosen gpgme requirement: version 1.1.0 is Ok.
* src/wydawca.h (MAX_DIRECTIVE_VERSION): Set to 102
(file_triplet) <version>: New member.
(min_directive_version)
(max_directive_version): New globals.
(directive_unpack_version): New proto.
* tests/upl11.at: New file.
* tests/upl12f.at: New file.
* tests/upl12t.at: New file.
* tests/Makefile.am (TESTSUITE_AT): Add new files.
* tests/atlocal.in (wydawca_upload): Change invocation. All uses updated.
(wydawca_cmparc): New function.
* tests/check-fail.at: Update.
* tests/check-notify.at: Update.
* tests/check-ok.at: Update.
* tests/dist/file12f.directive.asc: New file.
* tests/dist/file12t.directive.asc: New file.
* tests/etc/wydawca.rcin (test): Define "archive" clause.
* tests/mailstats.at: Update.
* tests/notify-upl.at: Update.
* tests/testsuite.at: Include new files.
* tests/upload-dry.at: Update.
* tests/upload.at: Update.
Diffstat (limited to 'src/wydawca.c')
-rw-r--r-- | src/wydawca.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/wydawca.c b/src/wydawca.c index 12f04de..69fb898 100644 --- a/src/wydawca.c +++ b/src/wydawca.c @@ -1,5 +1,5 @@ /* wydawca - automatic release submission daemon - Copyright (C) 2007, 2009-2011 Sergey Poznyakoff + Copyright (C) 2007, 2009-2012 Sergey Poznyakoff Wydawca is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -50,6 +50,9 @@ struct grecs_sockaddr listen_sockaddr; unsigned wydawca_stat[MAX_STAT]; +unsigned min_directive_version = MIN_DIRECTIVE_VERSION; +unsigned max_directive_version = MAX_DIRECTIVE_VERSION; + void initstats () { @@ -342,7 +345,7 @@ main (int argc, char **argv) argv += optind; argc -= optind; - p = gpgme_check_version ("1.2.0"); + p = gpgme_check_version ("1.1.0"); if (!p) { logmsg (LOG_CRIT, _("GPGMe version check failed")); |