/[smeserver]/rpms/smolt/sme8/smolt-0.9.8.1-sme.patch
ViewVC logotype

Annotation of /rpms/smolt/sme8/smolt-0.9.8.1-sme.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Tue Jun 12 21:16:45 2007 UTC (17 years, 4 months ago) by slords
Branch: MAIN
CVS Tags: smolt-0_9_8_1-7_el5_sme, smolt-0_9_8_1-5_el5_sme, smolt-0_9_8_1-8_el5_sme, smolt-0_9_8_1-3_el5_sme, smolt-0_9_8_1-4_el5_sme
Import on branch sme8 of package smolt-0.9.8.1-3.el5.sme.src.rpm

1 slords 1.1 diff -Nur -x '*.orig' -x '*.rej' smolt-0.9.8.1/client/smolt.py mezzanine_patched_smolt-0.9.8.1/client/smolt.py
2     --- smolt-0.9.8.1/client/smolt.py 2007-05-24 12:54:55.000000000 -0600
3     +++ mezzanine_patched_smolt-0.9.8.1/client/smolt.py 2007-06-06 11:54:01.000000000 -0600
4     @@ -41,7 +41,7 @@
5     from urlparse import urljoin
6     from urllib import urlencode
7    
8     -smoonURL = 'http://smolt.fedoraproject.org/'
9     +smoonURL = 'http://smolt.smeserverpro.com/'
10     smoltProtocol = '.91'
11     user_agent = 'smolt/%s' % smoltProtocol
12     timeout = 60.0
13     @@ -117,7 +117,10 @@
14     try:
15     self.bus = props['linux.subsystem'].strip()
16     except KeyError:
17     - self.bus = 'Unknown'
18     + try:
19     + self.bus = props['info.bus'].strip()
20     + except KeyError:
21     + self.bus = 'Unknown'
22     try:
23     self.vendorid = props['%s.vendor_id' % self.bus]
24     except KeyError:
25     @@ -141,7 +144,10 @@
26     try:
27     self.driver = props['info.linux.driver'].strip()
28     except KeyError:
29     - self.driver = 'Unknown'
30     + try:
31     + self.driver = props['net.linux.driver'].strip()
32     + except KeyError:
33     + self.driver = 'Unknown'
34     self.type = classify_hal(props)
35     self.deviceSendString = urlencode({
36     'UUID' : self.UUID,
37     @@ -177,7 +183,10 @@
38     try:
39     self.platform = hostInfo['system.kernel.machine']
40     except KeyError:
41     - self.platform = 'Unknown'
42     + try:
43     + self.platform = hostInfo['kernel.machine']
44     + except KeyError:
45     + self.platform = 'Unknown'
46     try:
47     self.systemVendor = hostInfo['system.vendor']
48     except:
49     @@ -199,10 +208,14 @@
50    
51     def ignoreDevice(device):
52     ignore = 1
53     - if device.bus == 'Unknown':
54     + if device.bus == 'Unknown' or device.bus == 'unknown':
55     + return 1
56     + if device.bus == 'block' or device.bus == 'ide':
57     return 1
58     if device.bus == 'usb' and device.type == None:
59     return 1
60     + if device.bus == 'usb' and device.type == 'OTHER':
61     + return 1
62     if device.bus == 'usb' and device.driver == 'hub':
63     return 1
64     if device.bus == 'sound' and device.driver == 'Unknown':
65     diff -Nur -x '*.orig' -x '*.rej' smolt-0.9.8.1/smoon/hardware/controllers.py mezzanine_patched_smolt-0.9.8.1/smoon/hardware/controllers.py
66     --- smolt-0.9.8.1/smoon/hardware/controllers.py 2007-05-24 12:54:23.000000000 -0600
67     +++ mezzanine_patched_smolt-0.9.8.1/smoon/hardware/controllers.py 2007-06-06 11:56:08.000000000 -0600
68     @@ -244,14 +244,15 @@
69     def devices(self):
70     devices = {}
71     tabs = Tabber()
72     + pciVendors = deviceMap('pci')
73     devices['total'] = HostLinks.select('1=1').count()
74     devices['count'] = Device.select('1=1').count()
75     devices['totalHosts'] = Host.select('1=1').count()
76     - devices['totalList'] = Host._connection.queryAll('select device.description, count(host_links.device_id) as cnt from host_links, device where host_links.device_id=device.id group by host_links.device_id order by cnt desc limit 100;')
77     - devices['uniqueList'] = Host._connection.queryAll('select device.description, count(distinct(host_links.host_link_id)) as cnt from host_links, device where host_links.device_id=device.id group by host_links.device_id order by cnt desc limit 100')
78     + devices['totalList'] = Host._connection.queryAll('select device.description, count(host_links.device_id) as cnt, device.vendor_id, device.device_id from host_links, device where host_links.device_id=device.id group by host_links.device_id order by cnt desc limit 100;')
79     + devices['uniqueList'] = Host._connection.queryAll('select device.description, count(distinct(host_links.host_link_id)) as cnt, device.vendor_id, device.device_id from host_links, device where host_links.device_id=device.id group by host_links.device_id order by cnt desc limit 100')
80     #devices['classes'] = Host._connection.queryAll('select device.class, count(distinct(host_links.host_link_id)) as cnt from host_links, device where host_links.device_id=device.id group by device.class order by cnt desc;')
81     devices['classes'] = Host._connection.queryAll('select distinct(class) from device')
82     - return dict(Host=Host, Device=Device, HostLinks=HostLinks, devices=devices, tabs=tabs)
83     + return dict(Host=Host, Device=Device, HostLinks=HostLinks, devices=devices, tabs=tabs, pciVendors=pciVendors)
84    
85     @expose(template="hardware.templates.stats")
86     def stats(self):
87     diff -Nur -x '*.orig' -x '*.rej' smolt-0.9.8.1/smoon/hardware/templates/devices.kid mezzanine_patched_smolt-0.9.8.1/smoon/hardware/templates/devices.kid
88     --- smolt-0.9.8.1/smoon/hardware/templates/devices.kid 2007-05-24 12:54:23.000000000 -0600
89     +++ mezzanine_patched_smolt-0.9.8.1/smoon/hardware/templates/devices.kid 2007-06-06 11:56:08.000000000 -0600
90     @@ -19,7 +19,7 @@
91     <div class="tabbertab"><h2>Raw Devices</h2>
92     <table id="stats" width="100%" border="0" cellpadding="3" cellspacing="3">
93     <tr py:for='dev in devices["totalList"]'>
94     - <th align="right">${dev[0]}</th>
95     + <th align="right">${pciVendors.device(dev[2], dev[3], alt=dev[0])}</th>
96     <td align="center">${dev[1]}</td>
97     <td nowrap="true"><strong>${'%.1f' % (float(dev[1]) / devices["total"] * 100) } %</strong></td>
98     <td nowrap="true"><img py:for='i in range(1, int( float(dev[1]) / devices["total"] * 1000 ))' src='/static/images/tile.png' /></td>
99     @@ -29,7 +29,7 @@
100     <div class="tabbertab"><h2>Machines / Device</h2>
101     <table id="stats" width="100%" border="0" cellpadding="3" cellspacing="3">
102     <tr py:for='dev in devices["uniqueList"]'>
103     - <th align="right">${dev[0]}</th>
104     + <th align="right">${pciVendors.device(dev[2], dev[3], alt=dev[0])}</th>
105     <td align="center">${dev[1]}</td>
106     <td nowrap="true"><strong>${'%.1f' % (float(dev[1]) / devices["totalHosts"] * 100) } %</strong></td>
107     <td nowrap="true"><img py:for='i in range(1, int( float(dev[1]) / devices["totalHosts"] * 100 ))' src='/static/images/tile.png' /></td>

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed