On Mon, 2007-12-17 at 12:00 -0500, et-mgmt-tools-request@xxxxxxxxxx wrote: > Send et-mgmt-tools mailing list submissions to > et-mgmt-tools@xxxxxxxxxx > > To subscribe or unsubscribe via the World Wide Web, visit > https://www.redhat.com/mailman/listinfo/et-mgmt-tools > or, via email, send a message with subject or body 'help' to > et-mgmt-tools-request@xxxxxxxxxx > > You can reach the person managing the list at > et-mgmt-tools-owner@xxxxxxxxxx > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of et-mgmt-tools digest..." > > > Today's Topics: > > 1. Understand git pull (Dan) > 2. Re: Cobbler 7.0.1 FC WebUI Testing on EL4 (Dan) > 3. Re: Understand git pull (Jeroen van Meeuwen) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Mon, 17 Dec 2007 08:57:05 +0100 > From: Dan <swissslinky@xxxxxxxxx> > Subject: Understand git pull > To: Fedora/Linux Management Tools <et-mgmt-tools@xxxxxxxxxx> > Message-ID: <1197878225.6854.4.camel@slinky> > Content-Type: text/plain > > 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 > > > > ------------------------------ > > Message: 2 > Date: Mon, 17 Dec 2007 09:28:23 +0100 > From: Dan <swissslinky@xxxxxxxxx> > Subject: Re: Cobbler 7.0.1 FC WebUI Testing on EL4 > To: Fedora/Linux Management Tools <et-mgmt-tools@xxxxxxxxxx> > Message-ID: <1197880103.6854.6.camel@slinky> > Content-Type: text/plain > > > 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. > > Merci beaucoup! All fixed. > > > > > > > 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 > > > > ------------------------------ > > Message: 3 > Date: Mon, 17 Dec 2007 10:21:51 +0100 > From: Jeroen van Meeuwen <kanarip@xxxxxxxxxxx> > Subject: Re: Understand git pull > To: Fedora/Linux Management Tools <et-mgmt-tools@xxxxxxxxxx> > Message-ID: <47663FAF.9090004@xxxxxxxxxxx> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > Dan wrote: > > 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? > > > > It translates as cobbler/webui/master.py has local changes that are not > in the repositories metadata (yet). > > Try 'git diff' to see the changes, or 'git status' to get an overview, > 'git commit' to commit them to the local repitory metadata, or 'git > reset --hard HEAD' to reset you to the latest point you have from the > upstream repositories (warning, you might/will lose changes). I see, thanks Jeroen!! I now see the error in my ways. I now have my own branch :) Seeing as this could be the last thing I send up before I go on holiday (bring on 5pm!!), to everybody in the Cobbler (and virt) community, Joyeux Noel et Bonne année!! > > Kind regards, > > Jeroen van Meeuwen > -kanarip > > > > > ------------------------------ > > _______________________________________________ > et-mgmt-tools mailing list > et-mgmt-tools@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/et-mgmt-tools > > End of et-mgmt-tools Digest, Vol 16, Issue 20 > ********************************************* _______________________________________________ et-mgmt-tools mailing list et-mgmt-tools@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/et-mgmt-tools
