Hi List,

I have just attempted to rebuild the SRPMs for cobbler to test it out.
There appears to be some source control conflict resolution issue in the
code.

RHEL 4.7 ES i386 1.2.0-1 SRPM rebuild
GMT +10 2008/09/01 7pm

When rubbing 'cobbler check' I get this;

Traceback (most recent call last):
  File "/usr/bin/cobbler", line 17, in ?
    import cobbler.cobbler as app
  File "/usr/lib/python2.3/site-packages/cobbler/cobbler.py", line 26, in ?
    import api
  File "/usr/lib/python2.3/site-packages/cobbler/api.py", line 207
    <<<<<<< HEAD:cobbler/api.py
     ^
SyntaxError: invalid syntax

Cutting out of file /usr/lib/python2.3/site-packages/cobbler/api.py lines
207..213 gives below:

<<<<<<< HEAD:cobbler/api.py
    def remove_system(self,ref,recursive=False):
=======
    def remove_system(self,ref, recursive=False):
>>>>>>> devel:cobbler/api.py
        self.log("remove_system",[ref.name])
        return self._config.systems().remove(ref.name)

There appears to be issues in cobbler/utils.py @ line 37, 107 and 842.

After cleaning those up, 'cobbler check' works.

-- 
Regards,

Paul De Audney
System Administrator
Direct       :  02 8296 5105
Main         :  1300 883 979 
International: +612 8296 5111 
Anchor Systems Pty Ltd - Hosting Heavyweights
http://www.anchor.com.au
_______________________________________________
cobbler mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/cobbler

Reply via email to