On Apr 18, 2006, at 12:08 PM, David Lee wrote:

On Wed, 12 Apr 2006, Andrew Beekhof wrote:

On 4/12/06, [email protected]
<[email protected]> wrote:
linux-ha CVS committal

Author  : zhenh
Host    :
Project : linux-ha
Module  : tools

Dir     : linux-ha/tools


Modified Files:
        haresources2cib.py.in


Log Message:
generate the cib in the final place with right permission

perfect

===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/haresources2cib.py.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- haresources2cib.py.in       12 Apr 2006 05:55:33 -0000      1.9
+++ haresources2cib.py.in       12 Apr 2006 08:58:24 -0000      1.10
@@ -338,6 +338,8 @@
 if __name__=="__main__" :
        resource_file = "/etc/ha.d/haresources"
        config_file = "/etc/ha.d/ha.cf"
+       target_file = "/var/lib/heartbeat/crm/cib.xml"
+       to_stdout = False
[...]

Absolute path-names? Doesn't feel right. (We're in a ".in" file, so we
should be able to abstract these into "@...@" things.)

ah, you're right.  not so perfect :-(



[...]
+ elif os.access(target_file, os.F_OK) or os.access (target_file+".sig", os.F_OK) : + sys.stderr.write("cib.xml or cib.xml.sig exist in /var/lib/heartbeat/crm/\n") + sys.stderr.write("please remove them before generating new cib.xml\n")
[...]

And another.

Could someone take a look? (I could do myself in a few days if you wish.)

--

:  David Lee                                I.T. Service          :
:  Senior Systems Programmer                Computer Centre       :
:                                           Durham University     :
:  http://www.dur.ac.uk/t.d.lee/            South Road            :
:                                           Durham DH1 3LE        :
:  Phone: +44 191 334 2752                  U.K.                  :
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/

--
Andrew Beekhof

"I'd find myself if I knew where myself left me" - MGF


_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/

Reply via email to