From 6cfe6f8fe1b7506e772403fecc9d7298fc52dc74 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Mon, 16 Feb 2009 16:17:03 +0200
Subject: Improve keyword (meta) expansion, add testsuite framework

* src/meta.c: New file.
* src/Makefile.am (wydawca_SOURCES): Add meta.c.
* Makefile.am (SUBDIRS): Add tests.
* configure.ac: Initialize testsuite.
* src/cmdline.opt: Add preprocessor-related options: --[no-]preprocessor,
-E

* src/mail.c, src/triplet.c, src/verify.c, src/wydawca.c, src/wydawca.h: Use
new expansion functions.
* src/update-2.0.awk: Replace % markup with $.

* etc/wydawca.rc: Switch to new meta-variable syntax.
* gnulib.modules: Add c-ctype.

* doc/Makefile.am (check-options): Rewrite.
* doc/wydawca.texi: Mark unrevised/obsolete material.

* tests/: New directory
---
 etc/wydawca.rc | 90 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

(limited to 'etc')

diff --git a/etc/wydawca.rc b/etc/wydawca.rc
index c722fa6..205c4e0 100644
--- a/etc/wydawca.rc
+++ b/etc/wydawca.rc
@@ -59,13 +59,13 @@ access-method project-owner {
 	  "WHERE user_group.user_id=user.user_id "
 	  "AND user_group.group_id=groups.group_id "
 	  "AND user_group.admin_flags = 'A' "
-	  "AND groups.unix_group_name='%p'");
+	  "AND groups.unix_group_name='$p'");
 }
 
 access-method user-data {
   type sql;
   params (default,
-          "SELECT email, realname FROM user WHERE user_name='%{user}'");
+          "SELECT email, realname FROM user WHERE user_name='${user}'");
 }
 
 access-method verify-user {
@@ -76,13 +76,13 @@ access-method verify-user {
 	  "WHERE user_group.user_id=user.user_id "
 	  "AND user_group.group_id=groups.group_id "
 	  "AND user_group.admin_flags = 'A' "
-	  "AND groups.unix_group_name='%p' AND user.user_name='%u'");
+	  "AND groups.unix_group_name='$p' AND user.user_name='$u'");
 }
 
 access-method gpg-key {
   type sql;
   params (default,
-          "SELECT gpg_key FROM user WHERE user_name='%u'");
+          "SELECT gpg_key FROM user WHERE user_name='$u'");
 }
 
 #############################################################################
@@ -116,22 +116,22 @@ mail-statistics {
   message <<EOT
 Subject: Wydawca stats
 
-This is to notify you that the run of wydawca on %{date}
+This is to notify you that the run of wydawca on ${date}
 caused the following results:
 
-errors ............................. %{stat:errors}               
-warning ............................ %{stat:warnings}             
-bad signatures ..................... %{stat:bad_signatures}       
-access violation attempts .......... %{stat:access_violations}    
-complete triplets .................. %{stat:complete_triplets}    
-incomplete triplets ................ %{stat:incomplete_triplets}  
-bad triplets ....................... %{stat:bad_triplets}         
-expired triplets ................... %{stat:expired_triplets}     
-triplet successes .................. %{stat:triplet_success}      
-files uploaded ..................... %{stat:uploads}              
-files archived ..................... %{stat:archives}             
-symlinks created ................... %{stat:symlinks}             
-symlinks removed ................... %{stat:rmsymlinks}           
+errors ............................. ${stat:errors}               
+warning ............................ ${stat:warnings}             
+bad signatures ..................... ${stat:bad_signatures}       
+access violation attempts .......... ${stat:access_violations}    
+complete triplets .................. ${stat:complete_triplets}    
+incomplete triplets ................ ${stat:incomplete_triplets}  
+bad triplets ....................... ${stat:bad_triplets}         
+expired triplets ................... ${stat:expired_triplets}     
+triplet successes .................. ${stat:triplet_success}      
+files uploaded ..................... ${stat:uploads}              
+files archived ..................... ${stat:archives}             
+symlinks created ................... ${stat:symlinks}             
+symlinks removed ................... ${stat:rmsymlinks}           
 
 Regards,
 Wydawca
@@ -145,11 +145,11 @@ notify-event {
   event success;
   recipient user;
   message <<EOT
-Subject: Upload of %{project} successful
+Subject: Upload of ${project} successful
 
-Upload of %{project} to %{dir} finished successfully. Files uploaded:
+Upload of ${project} to ${dir} finished successfully. Files uploaded:
 
-%{triplet:upload}
+${triplet:upload}
 
 Regards,
 Wydawca
@@ -162,12 +162,12 @@ notify-event {
   event success;
   recipient owner;
   message <<EOT
-Subject: Upload of %{project} successful
+Subject: Upload of ${project} successful
 
-%{user:real-name} (%{user:email}) successfully uploaded files
-for %{project} to %{dir}. Files uploaded:
+${user:real-name} (${user:email}) successfully uploaded files
+for ${project} to ${dir}. Files uploaded:
 
-%{triplet:upload}
+${triplet:upload}
 
 Regards,
 Wydawca
@@ -181,17 +181,17 @@ notify-event {
   event bad-ownership;
   recipient owner;
   message <<EOT
-Subject: Suspicious upload of %{project}
+Subject: Suspicious upload of ${project}
 
-Someone not authorized to make releases for %{project}
-has attempted to upload the following files to %{dir}:
+Someone not authorized to make releases for ${project}
+has attempted to upload the following files to ${dir}:
 
-%{triplet:full}
+${triplet:full}
 
 This upload has been ignored and the files removed. The person who attempted
-the upload was %{user:real-name}, user name %{user:name}, email %{user:email}.
+the upload was ${user:real-name}, user name ${user:name}, email ${user:email}.
 If you think this is an error and wish this user to be authorized to make
-releases for %{project}, please contact <puszcza-hackers@gnu.org.ua>.
+releases for ${project}, please contact <puszcza-hackers@gnu.org.ua>.
 Otherwise, let us know so we could undertake appropriate measures.
 
 Regards,
@@ -209,13 +209,13 @@ notify-event {
   event bad-directive-signature;
   recipient user;
   message <<EOT
-Subject: Suspicious upload of %{project}
+Subject: Suspicious upload of ${project}
 
-Someone (apparently you), has tried to make a release for %{project}.
+Someone (apparently you), has tried to make a release for ${project}.
 However, the signature of the directive file was wrong, which looks
 suspicious. The person uploaded the following files:
 
-%{triplet:full}
+${triplet:full}
 
 This upload has been ignored and the files removed. If it was you who
 attempted this upload, please make sure you use the right PGP key and
@@ -234,13 +234,13 @@ notify-event {
   event bad-directive-signature;
   recipient owner;
   message <<EOT
-Subject: Suspicious upload of %{project}
+Subject: Suspicious upload of ${project}
 
-%{user:real-name} (%{user:email}) has tried to make a release
-for %{project}. However, the signature of the directive file was wrong,
+${user:real-name} (${user:email}) has tried to make a release
+for ${project}. However, the signature of the directive file was wrong,
 which looks suspicious. The person uploaded the following files:
 
-%{triplet:full}
+${triplet:full}
 
 This upload has been ignored and the files removed.
 
@@ -259,13 +259,13 @@ notify-event {
   event bad-detached-signature;
   recipient user;
   message <<EOT
-Subject: Suspicious upload of %{project}
+Subject: Suspicious upload of ${project}
 
-Someone (apparently you), has tried to make a release for %{project}.
+Someone (apparently you), has tried to make a release for ${project}.
 However, the detached signature signature was wrong, which looks
 suspicious. The person uploaded the following files:
 
-%{triplet:full}
+${triplet:full}
 
 This upload has been ignored and the files removed. If it was you who
 attempted this upload, please make sure you use the right PGP key and
@@ -284,13 +284,13 @@ notify-event {
   event bad-detached-signature;
   recipient owner;
   message <<EOT
-Subject: Suspicious upload of %{project}
+Subject: Suspicious upload of ${project}
 
-%{user:real-name} (%{user:email}) has tried to make a release
-for %{project}. However, the detached signature file was wrong,
+${user:real-name} (${user:email}) has tried to make a release
+for ${project}. However, the detached signature file was wrong,
 which looks suspicious. The person uploaded the following files:
 
-%{triplet:full}
+${triplet:full}
 
 This upload has been ignored and the files removed.
 
-- 
cgit v1.2.1