Awesome, thanks Micheal! I've quoted but changed the title, as it's kinda related ;-) I get this problem now and again and being new to git I'm not too sure what's going on. What does the following translate as? -snip- # git pull remote: Generating pack... remote: Done counting 67 objects. Result has 53 objects. remote: Deltifying 53 objects... remote: 100% (53/53) done Unpacking 53 objects... remote: Total 53 (delta 38), reused 0 (delta 0) 100% (53/53) done * refs/remotes/[branch]: fast forward to branch 'devel' of git://fedora/blah.. old..new: ffd71b1..8e1b4b1 Updating ffd71b1..8e1b4b1 cobbler/webui/master.py: needs update fatal: Entry 'cobbler/webui/master.py' not uptodate. Cannot merge. -snip- this was last night. Its happened before, so I've just left it and come back to it later and its usually been fixed. This morning: -snip Updating ffd71b1..8e1b4b1 cobbler/webui/master.py: needs update fatal: Entry 'cobbler/webui/master.py' not uptodate. Cannot merge. -snip- Dan xx On Fri, 2007-12-14 at 17:50 -0500, Michael DeHaan wrote: > Michael DeHaan wrote: > > Dan wrote: > >> I skimmed the code and I don't see why it's unexpected? It's being told > >> that it will be coming through...? > >> > >> Note, striking F5 a few times wakes it up. > > > > I just tried to replicate this on a fresh EL4.4 install, using Cobbler > > 0.7.1, and was able to log in the first time in the WebUI. > > /var/log/cobbler/cobbler.log and /var/log/httpd/error.log also didn't > > contain any noise. > > As pointed out on IRC, I mean 0.7.0 (the RPMs on the web site). I've > just now bumped git to start 0.7.1. > > > > Also, did you restart cobblerd, httpd prior to testing it?... that > > might have been the problem depending on whether the Apache > > mod_python config had taken effect or not yet. Note the new URL is > > http://server/cobbler/web, not the old CGI URL, though > > the old CGI should have been removed with the previous RPM. > > > > Can you provide any other data to help recreate this? > > > > --Michael > >> -- > >> > >> Mod_python error: "PythonHandler index" > >> > >> Traceback (most recent call last): > >> > >> File "/usr/lib/python2.3/site-packages/mod_python/apache.py", line > >> 299, in HandlerDispatch > >> result = object(req) > >> > >> File "/var/www/cobbler/web/index.py", line 89, in handler > >> server = "http://127.0.0.1/cobbler_api_rw"; > >> > >> TypeError: __init__() got an unexpected keyword argument 'apache' > >> > >> -- > >> > >> > >> Will keep playing :) > >> > >> _______________________________________________ > >> et-mgmt-tools mailing list > >> et-mgmt-tools@xxxxxxxxxx > >> https://www.redhat.com/mailman/listinfo/et-mgmt-tools > >> > > > > _______________________________________________ > > et-mgmt-tools mailing list > > et-mgmt-tools@xxxxxxxxxx > > https://www.redhat.com/mailman/listinfo/et-mgmt-tools > > _______________________________________________ > et-mgmt-tools mailing list > et-mgmt-tools@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/et-mgmt-tools _______________________________________________ et-mgmt-tools mailing list et-mgmt-tools@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/et-mgmt-tools
