rendered paste bodydiff -r d9f38b3eefe3 hw-client/Profile.py--- a/hw-client/Profile.py Fri Jan 26 23:59:32 2007 -0600+++ b/hw-client/Profile.py Wed Jan 31 14:42:14 2007 -0800@@ -101,26 +101,26 @@ class Profile: else: yield "UUID=%s&Bus=%s&Driver=%s&Class=%s&Description=%s" % (self.UUID, Bus, Driver, Class, Description) - def print_data(self):- print 'We are about to send the following information to the Fedora Smolt server:'- print- print '\tUUID: %s' % self.UUID- print '\tlsbRelease: %s' % self.lsbRelease- print '\tOS: %s' % self.OS- print '\tdefaultRunlevel: %s' % self.defaultRunlevel- print '\tlanguage: %s' % self.language- print '\tplatform: %s' % self.platform- print '\tbogomips: %s' % self.bogomips- print '\tCPUVendor: %s' % self.CPUVendor- print '\tnumCPUs: %s' % self.numCPUs- print '\tCPUSpeed: %s' % self.CPUSpeed- print '\tsystemMemory: %s' % self.systemMemory- print '\tsystemSwap: %s' % self.systemSwap- print '\tvendor: %s' % self.vendor- print '\tsystem: %s' % self.system- print- print '\t\t Devices'- print '\t\t================================='+ def return_report(self):+ report = []++ report.append('\tUUID: %s' % self.UUID)+ report.append('\tlsbRelease: %s' % self.lsbRelease)+ report.append('\tOS: %s' % self.OS)+ report.append('\tdefaultRunlevel: %s' % self.defaultRunlevel)+ report.append('\tlanguage: %s' % self.language)+ report.append('\tplatform: %s' % self.platform)+ report.append('\tbogomips: %s' % self.bogomips)+ report.append('\tCPUVendor: %s' % self.CPUVendor)+ report.append('\tnumCPUs: %s' % self.numCPUs)+ report.append('\tCPUSpeed: %s' % self.CPUSpeed)+ report.append('\tsystemMemory: %s' % self.systemMemory)+ report.append('\tsystemSwap: %s' % self.systemSwap)+ report.append('\tvendor: %s' % self.vendor)+ report.append('\tsystem: %s' % self.system)+ report.append('\n')+ report.append('\t\t Devices')+ report.append('\t\t=================================') for device in self.hw: try: Bus = device['bus']@@ -130,5 +130,9 @@ class Profile: except: continue else:- print '\t\t%s, %s, %s, %s' % (Bus, Driver, Class, Description)- + report.append('\t\t%s, %s, %s, %s' % (Bus, Driver, Class, Description))++ return '\n'.join(report)++ def print_data(self):+ print self.return_report()diff -r d9f38b3eefe3 hw-client/readProfile--- a/hw-client/readProfile Fri Jan 26 23:59:32 2007 -0600+++ b/hw-client/readProfile Wed Jan 31 14:39:53 2007 -0800@@ -7,4 +7,4 @@ import Profile profile = Profile.Profile() -profile.print_data()+print profile.return_report()