From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Fri, 14 Aug 2009 19:17:55 +0000 (+0100)
Subject: Merge branch 'stable-3.x'
X-Git-Tag: 3.4~189
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;h=efc8497c2414dfded724d7181e11df53b947e387;hp=ad7330407875909b4723839c8872da2de61c8244;p=ypp-sc-tools.db-test.git

Merge branch 'stable-3.x'
---

diff --git a/yarrg/commod-update-receiver b/yarrg/commod-update-receiver
index f114428..4ae267d 100755
--- a/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@ -133,9 +133,10 @@ foreach my $mid (<_mid-*.hold>) {
     unlink $mid or $!==&ENOENT or die "$mid $!";
 }
 
+$o{'instance'}= $ENV{'YARRG_INSTANCE'};
 
 my $mcontent= MIME::Entity->build(To => 'yarrg-commod-updates',
-				  Subject => $pwd,
+				  Subject => $ENV{'YARRG_INSTANCE'},
 				  Type => 'multipart/mixed',
 				  Boundary => '=',
 				  'Message-ID' => $mid,
diff --git a/yarrg/common.c b/yarrg/common.c
index f95e585..cc33235 100644
--- a/yarrg/common.c
+++ b/yarrg/common.c
@@ -122,7 +122,7 @@ int gzopen(const char *zpath, int oflags, FILE **f_r, pid_t *pid_r,
 	   const char *gziplevel /* 0 for read; may be 0, or "-1" etc. */) {
 
   int zfd= open(zpath, oflags, 0666);
-  if (!zfd) return errno;
+  if (zfd<0) return errno;
 
   int pipefds[2];
   sysassert(! pipe(pipefds) );
diff --git a/yarrg/convert.c b/yarrg/convert.c
index adccb1c..555eefe 100644
--- a/yarrg/convert.c
+++ b/yarrg/convert.c
@@ -262,6 +262,7 @@ int main(int argc, char **argv) {
     else if (IS("--dict-read-only"))   o_flags &= (~ffs_dict | ff_dict_fetch);
     else if (IS("--dict-anon"))        o_flags &= ~ff_dict_pirate;
     else if (IS("--dict-submit"))      o_flags |= ff_dict_fetch|ff_dict_submit;
+    else if (IS("--dict-no-update"))   o_flags &= ~ff_dict_fetch; // testing
     else if (IS("--raw-tsv"))          outputmode(omk_raw,0);
     else if (IS("--upload"))           outputmode_uploads();
     else if (IS("--upload-yarrg"))     outputmode(omk_upload_yarrg,arg+2);
diff --git a/yarrg/dictionary-manager b/yarrg/dictionary-manager
index c8e003d..623e07d 100755
--- a/yarrg/dictionary-manager
+++ b/yarrg/dictionary-manager
@@ -25,9 +25,9 @@
 # sponsored by Three Rings.
 
 
-# ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict/pctb /home/ftp/users/ijackson/pctb
+# ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict/yarrg /home/ftp/users/ijackson/yarrg
 
-# ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict-test/pctb /home/ftp/users/ijackson/pctb/test
+# ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict-test/yarrg /home/ftp/users/ijackson/yarrg/test
 
 # ./dictionary-manager --approve-updates '' . .