Anderson Silva wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Michael DeHaan wrote: > >> Anderson Silva wrote: >> Michael DeHaan wrote: >> >> >>>>> Michael DeHaan wrote: >>>>> >>>>> >>>>>> Harry Hoffman wrote: >>>>>> >>>>>> >>>>>> >>>>>>> Doh! >>>>>>> >>>>>>> [EMAIL PROTECTED] repo_mirror]# cobbler report >>>>>>> >>>>>>> BootAPI instance has no attribute 'report' >>>>>>> File "/usr/lib/python2.4/site-packages/cobbler/cobbler.py", line >>>>>>> 77, >>>>>>> in main >>>>>>> rc = BootCLI().run(sys.argv) >>>>>>> >>>>>>> File "/usr/lib/python2.4/site-packages/cobbler/cobbler.py", line >>>>>>> 57, >>>>>>> in run >>>>>>> return self.loader.run(args) >>>>>>> >>>>>>> File "/usr/lib/python2.4/site-packages/cobbler/commands.py", line >>>>>>> 116, in run >>>>>>> return fn.run() >>>>>>> >>>>>>> File >>>>>>> "/usr/lib/python2.4/site-packages/cobbler/modules/cli_report.py", line >>>>>>> 115, in run >>>>>>> print self.api.report(report_what = self.options.what, >>>>>>> report_name >>>>>>> = self.options.name, \ >>>>>>> >>>>>>> >>>>>>> But cobbler sync works correctly now :-) >>>>>>> >>>>>>> Cheers, >>>>>>> Harry >>>>>>> >>>>>>> >>>>>>> Michael DeHaan wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>>> Ordinarily I wouldn't drop a fix so quickly, but seeing this is a fix >>>>>>>> for a fix: >>>>>>>> >>>>>>>> http://git.fedorahosted.org/git/?p=cobbler;a=commitdiff;h=29ff4468dfb9289e490442bea6d95f995677bea8 >>>>>>>> http://people.fedoraproject.org/~mdehaan/files/cobbler/ >>>>>>>> >>>>>>>> I'll update the builders shortly. >>>>>>>> >>>>>>>> --Michael >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> _______________________________________________ >>>>>>>> cobbler mailing list >>>>>>>> [email protected] >>>>>>>> https://fedorahosted.org/mailman/listinfo/cobbler >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> _______________________________________________ >>>>>>> cobbler mailing list >>>>>>> [email protected] >>>>>>> https://fedorahosted.org/mailman/listinfo/cobbler >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> Indeed, that report patch should /not/ be applied to master. >>>>>> >>>>>> I will sort this out shortly, thanks. >>>>>> >>>>>> --Michael >>>>>> >>>>>> >>>>>> >>>>>> _______________________________________________ >>>>>> cobbler mailing list >>>>>> [email protected] >>>>>> https://fedorahosted.org/mailman/listinfo/cobbler >>>>>> >>>>>> >>>>>> >>>>> As I suspected, the problem was that cli_report.py, which was /not/ >>>>> packaged in git (rightfully so), was left over from a previous aborted >>>>> patch and was built into this RPM. The fix is: >>>>> >>>>> rm /usr/lib/python2.X/site-packages/cobbler/modules/cli_report.py >>>>> >>>>> I'll work at fixing the RPM. Shouldn't be long... >>>>> >>>>> (Meanwhile, the next thing I want to add is to make sure "make test" and >>>>> the RPM build target builds from a clean checkout each time so as to not >>>>> allow any files not in git from entering into the rpms) >>>>> >>>>> --Michael >>>>> >>>>> _______________________________________________ >>>>> cobbler mailing list >>>>> [email protected] >>>>> https://fedorahosted.org/mailman/listinfo/cobbler >>>>> >>>>> >> Hmmm... if this was something I did wrong, my apologies in advance. >> >> AS >> > _______________________________________________ > cobbler mailing list > [email protected] > https://fedorahosted.org/mailman/listinfo/cobbler > > >> No, it's not, totally on my end. >> > > >> What happened was when I reverted your patch somehow I didn't delete the >> cli_report.py file -- while it wasn't in git, it still >> showed up in the RPM. >> > > >> (Regarding your patch, do see my earlier response -- I couldn't get it >> to apply for whatever reason and would definitely like it in >> there for 1.4) >> > > Actually, I never got your response. I created the diff with a 'git > diff'. What error did you get? I applied it against the lates git close > (around the time I had submitted). > > AS > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.7 (GNU/Linux) > Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org > > iD8DBQFIxUFjECmX3C4JWKgRAou2AKCmIe34w4hdGk705KtrAGo6fGc5GwCgxvX0 > IZ58dcL2eVo7S1L8khY2HWc= > =Nku3 > -----END PGP SIGNATURE----- > _______________________________________________ > cobbler mailing list > [email protected] > https://fedorahosted.org/mailman/listinfo/cobbler >
Basically I couldn't apply it. Can you git-rebase && git-format-patch to resend it? I think it was also missing the parts to make the various commands like "cobbler distro|profile|system|repo|image report" use the new report code. --Michael _______________________________________________ cobbler mailing list [email protected] https://fedorahosted.org/mailman/listinfo/cobbler
