summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2010-06-10 14:11:48 -0500
committerSol Jerome <sol.jerome@gmail.com>2010-06-10 14:11:48 -0500
commite89e645ff0cbdbf74929c13f2db588c3de5d5a0e (patch)
tree19a1be6594855cbc107c53a528c0fbeed6d35a3f /src
parent0e0018b198d48e9aa9d54fd03e73edef6876a92c (diff)
downloadbcfg2-e89e645ff0cbdbf74929c13f2db588c3de5d5a0e.tar.gz
bcfg2-e89e645ff0cbdbf74929c13f2db588c3de5d5a0e.tar.bz2
bcfg2-e89e645ff0cbdbf74929c13f2db588c3de5d5a0e.zip
tabs -> spaces
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/Tools/SYSV.py10
-rwxr-xr-xsrc/lib/Server/Admin/Reports.py4
-rw-r--r--src/lib/Server/Reports/reports/views.py2
-rw-r--r--src/lib/Server/Reports/updatefix.py4
4 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/Client/Tools/SYSV.py b/src/lib/Client/Tools/SYSV.py
index 20e13c177..c2b0eb2cc 100644
--- a/src/lib/Client/Tools/SYSV.py
+++ b/src/lib/Client/Tools/SYSV.py
@@ -49,11 +49,11 @@ class SYSV(Bcfg2.Client.Tools.PkgTool):
# Build list of packages
lines = self.cmd.run("/usr/bin/pkginfo -x")[1]
while lines:
- # Splitting on whitespace means that packages with spaces in
- # their version numbers don't work right. Found this with
- # IBM TSM software with package versions like
- # "Version 6 Release 1 Level 0.0"
- # Should probably be done with a regex but this works.
+ # Splitting on whitespace means that packages with spaces in
+ # their version numbers don't work right. Found this with
+ # IBM TSM software with package versions like
+ # "Version 6 Release 1 Level 0.0"
+ # Should probably be done with a regex but this works.
version = lines.pop().split(') ')[1]
pkg = lines.pop().split()[0]
self.installed[pkg] = version
diff --git a/src/lib/Server/Admin/Reports.py b/src/lib/Server/Admin/Reports.py
index 21b8d8d80..87a91a2bd 100755
--- a/src/lib/Server/Admin/Reports.py
+++ b/src/lib/Server/Admin/Reports.py
@@ -38,8 +38,8 @@ os.environ['DJANGO_SETTINGS_MODULE'] = '%s.settings' % project_name
from django.db import connection
from Bcfg2.Server.Reports.reports.models import Client, Interaction, Entries, \
- Entries_interactions, Performance, \
- Reason, Ping, TYPE_CHOICES, InternalDatabaseVersion
+ Entries_interactions, Performance, \
+ Reason, Ping, TYPE_CHOICES, InternalDatabaseVersion
class Reports(Bcfg2.Server.Admin.Mode):
'''Admin interface for dynamic reports'''
diff --git a/src/lib/Server/Reports/reports/views.py b/src/lib/Server/Reports/reports/views.py
index 230e0a503..d159dcd43 100644
--- a/src/lib/Server/Reports/reports/views.py
+++ b/src/lib/Server/Reports/reports/views.py
@@ -146,7 +146,7 @@ def client_detailed_list(request, **kwargs):
for inter in interactions:
if inter.client_id in c_dict:
entry_list.append([c_dict[inter.client_id], inter, \
- entry_max - inter.timestamp > timedelta(hours=24)])
+ entry_max - inter.timestamp > timedelta(hours=24)])
entry_list.sort(lambda a,b: cmp(a[0], b[0]))
'''
if(datetime.now()-self.timestamp > timedelta(hours=25) ):
diff --git a/src/lib/Server/Reports/updatefix.py b/src/lib/Server/Reports/updatefix.py
index 37e40c3bd..df2e812df 100644
--- a/src/lib/Server/Reports/updatefix.py
+++ b/src/lib/Server/Reports/updatefix.py
@@ -3,7 +3,7 @@ import Bcfg2.Server.Reports.settings
from django.db import connection
import django.core.management
from Bcfg2.Server.Reports.reports.models import InternalDatabaseVersion, \
- TYPE_BAD, TYPE_MODIFIED, TYPE_EXTRA
+ TYPE_BAD, TYPE_MODIFIED, TYPE_EXTRA
import logging, traceback
logger = logging.getLogger('Bcfg2.Server.Reports.UpdateFix')
@@ -66,7 +66,7 @@ def _populate_interaction_entry_counts():
for type in count_field.keys():
cursor.execute("select count(type), interaction_id "+
- "from reports_entries_interactions where type = %s group by interaction_id" % type)
+ "from reports_entries_interactions where type = %s group by interaction_id" % type)
updates = []
for row in cursor.fetchall():
updates.append(row)