[Python-apps-commits] r13304 - in packages/irker/trunk/debian (2 files)

[drnlmza-guest at users.alioth.debian.org]

    Date: Friday, June 17, 2016 @ 11:35:47
  Author: drnlmza-guest
Revision: 13304

Update irkerhook-git to warn about missing config settings and refresh manual page patch accordingly

Modified:
  packages/irker/trunk/debian/local/irkerhook-git
  packages/irker/trunk/debian/patches/0007-irkerhook-git.patch

Modified: packages/irker/trunk/debian/local/irkerhook-git
===================================================================
--- packages/irker/trunk/debian/local/irkerhook-git	2016-06-16 19:47:48 UTC (rev 13303)
+++ packages/irker/trunk/debian/local/irkerhook-git	2016-06-17 11:35:47 UTC (rev 13304)
@@ -2,8 +2,10 @@
 
 set -e
 
-if [ -z "$(git config --get irker.project)" ]
+if [ -z "$(git config --get irker.project)" -a -z "$(git config --get irker.template)" ]
 then
+   echo "CONFIGURATION ERROR: Neither irker.project nor irker.template defined"
+   echo "NOT sending IRC notification"
 	exit 0
 fi
 

Modified: packages/irker/trunk/debian/patches/0007-irkerhook-git.patch
===================================================================
--- packages/irker/trunk/debian/patches/0007-irkerhook-git.patch	2016-06-16 19:47:48 UTC (rev 13303)
+++ packages/irker/trunk/debian/patches/0007-irkerhook-git.patch	2016-06-17 11:35:47 UTC (rev 13304)
@@ -6,16 +6,16 @@
 Last-Update: 2016-03-15
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/irkerhook.xml b/irkerhook.xml
-index 72918cf..9e59586 100644
 --- a/irkerhook.xml
 +++ b/irkerhook.xml
-@@ -208,6 +208,9 @@ while read old new refname; do
+@@ -217,6 +217,11 @@
  done
  </programlisting>
  
 +<para>For convenience, this is implemented by the irkerhook-git
-+helper script.</para>
++helper script. This script will complain about some common configuration
++isssues. For simplicity, irkerhook-git does not support all the
++options of irkerhook.py, and is thus not suitable for all applications.</para>
 +
  <para>Preferences may be set in the repo <filename>config</filename>
  file in an [irker] section. Here is an example of what that can look