• R/O
  • SSH

pm_crmgen: Commit

※リポジトリは、https://github.com/linux-ha-japan/pm_crmgen-1.0 へ移行しました。

Pacemaker 1.0 設定編集ツール

Heartbeat-2.1.4 用 hb-cibgen(*) の Pacemaker対応版。
(*) http://sourceforge.jp/projects/linux-ha/releases/?package_id=10290


Commit MetaInfo

Revision5f54b701f9a97bf9d25244bfb6374cadefd1bc81 (tree)
Time2011-12-14 14:33:11
AuthorKazunori INOUE <inouekazu@inte...>
CommiterKazunori INOUE

Log Message

Update versions

Change Summary

Incremental Difference

diff -r c099f7015805 -r 5f54b701f9a9 README
--- a/README Wed Dec 14 14:32:40 2011 +0900
+++ b/README Wed Dec 14 14:33:11 2011 +0900
@@ -0,0 +1,9 @@
1+ * RHEL5の環境でRPMをビルドする場合は、以下のマクロファイルを作成してください。
2+
3+[root@x3650a ~]# cat /etc/rpm/macros.dist
4+# dist macros.
5+
6+%rhel 5
7+%dist .el5
8+%el5 1
9+[root@x3650a ~]#
diff -r c099f7015805 -r 5f54b701f9a9 configure.ac
--- a/configure.ac Wed Dec 14 14:32:40 2011 +0900
+++ b/configure.ac Wed Dec 14 14:33:11 2011 +0900
@@ -2,12 +2,11 @@
22 # Process this file with autoconf to produce a configure script.
33
44 AC_PREREQ(2.59)
5-AC_INIT(pm_crmgen, 1.1)
6-AM_INIT_AUTOMAKE(pm_crmgen, 1.1)
5+AC_INIT(pm_crmgen, 1.2)
6+AM_INIT_AUTOMAKE(pm_crmgen, 1.2)
77
88 # Checks for programs.
99 AC_PROG_LN_S
10-
1110 AC_PREFIX_DEFAULT(/usr)
1211
1312 dnl ===============================================
@@ -21,30 +20,10 @@
2120 fi
2221 AC_MSG_RESULT(using $PYTHON);
2322
24-prefix_orig="$prefix"
2523 prefix=`eval echo "$prefix"`
2624 case $prefix in
2725 NONE) prefix=/usr;;
2826 esac
29-var(){
30- case $1 in
31- *'${'*) res=`eval echo "$1"`;;
32- *) res="$1";;
33- esac
34- case "$res" in
35- ""|NONE) echo "$2";;
36- *) echo "$res";;
37- esac
38-}
39-
40-grep "release 6" /etc/redhat-release -q
41-if test $? = 0; then
42- rhelver=6
43-else
44- rhelver=5
45-fi
46-RHEL_VER="$rhelver"
47-AC_SUBST(RHEL_VER)
4827
4928 AC_CONFIG_FILES(Makefile \
5029 pm_crmgen.spec
diff -r c099f7015805 -r 5f54b701f9a9 pm_crmgen.py
--- a/pm_crmgen.py Wed Dec 14 14:32:40 2011 +0900
+++ b/pm_crmgen.py Wed Dec 14 14:33:11 2011 +0900
@@ -169,7 +169,7 @@
169169 '''
170170 def optionParser(self):
171171 usage = '%prog [options] CSV_FILE'
172- version = '1.1'
172+ version = '1.2'
173173 description = " character encoding of supported CSV_FILE are 'UTF-8' and 'Shift_JIS'"
174174 prog = 'pm_crmgen'
175175 p = OptionParser(usage=usage,version=version,description=description,prog=prog)
@@ -1756,18 +1756,18 @@
17561756 ・要素の前後の全半角空白/タブ/改行を削除
17571757 ・文字列中の改行を半角空白に置換
17581758 [引数]
1759- list : 変換対象のリスト
1759+ tl : 変換対象のリスト
17601760 encoding : `encoding' -> Unicode に変換
17611761 [戻り値]
17621762 True : OK
17631763 False : NG
17641764 '''
1765-def unicode_listitem(list,encoding):
1766- for i,data in [(i,x) for (i,x) in enumerate(list) if x]:
1765+def unicode_listitem(tl,encoding):
1766+ for i,data in [(i,x) for (i,x) in enumerate(tl) if x]:
17671767 while data.count('\n\n'):
17681768 data = data.replace('\n\n','\n')
17691769 try:
1770- list[i] = del_blank(unicode(data.replace('\n',' '),encoding))
1770+ tl[i] = del_blank(unicode(data.replace('\n',' '),encoding))
17711771 except:
17721772 log.error(u'データのUnicodeへの変換に失敗しました。')
17731773 return False
diff -r c099f7015805 -r 5f54b701f9a9 pm_crmgen.spec.in
--- a/pm_crmgen.spec.in Wed Dec 14 14:32:40 2011 +0900
+++ b/pm_crmgen.spec.in Wed Dec 14 14:33:11 2011 +0900
@@ -3,8 +3,8 @@
33 ########################################
44 %define __check_files %{nil}
55 %define name pm_crmgen
6-%define version 1.1
7-%define release 1.el@RHEL_VER@
6+%define version 1.2
7+%define release 1
88 %define prefix /usr
99 %define ORGARCH %{name}-%{version}
1010 #
@@ -13,7 +13,7 @@
1313 Summary: Pacemaker crm-file generator
1414 Name: %{name}
1515 Version: %{version}
16-Release: %{release}
16+Release: %{release}%{?dist}
1717 Group: Applications
1818 Source: %{ORGARCH}.tar.gz
1919 License: GPL
Show on old repository browser