summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Reporting/models.py
diff options
context:
space:
mode:
authorTim Laszlo <tim.laszlo@gmail.com>2012-10-16 09:47:19 -0500
committerTim Laszlo <tim.laszlo@gmail.com>2012-10-16 09:47:44 -0500
commit22cea7c28a7050f762aa3ac1a5ea67ad1c7bf66d (patch)
tree34f3d2afdd74349219895237fae5752a80ea0d11 /src/lib/Bcfg2/Reporting/models.py
parenta1c4d6ac73a5240ba308deffe8c2eb706af90ccd (diff)
downloadbcfg2-22cea7c28a7050f762aa3ac1a5ea67ad1c7bf66d.tar.gz
bcfg2-22cea7c28a7050f762aa3ac1a5ea67ad1c7bf66d.tar.bz2
bcfg2-22cea7c28a7050f762aa3ac1a5ea67ad1c7bf66d.zip
Reporting: use mode instead of perms
Diffstat (limited to 'src/lib/Bcfg2/Reporting/models.py')
-rw-r--r--src/lib/Bcfg2/Reporting/models.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Reporting/models.py b/src/lib/Bcfg2/Reporting/models.py
index 3b8ccc52e..f54a76322 100644
--- a/src/lib/Bcfg2/Reporting/models.py
+++ b/src/lib/Bcfg2/Reporting/models.py
@@ -291,14 +291,14 @@ class Bundle(models.Model):
class FilePerms(models.Model):
owner = models.CharField(max_length=128)
group = models.CharField(max_length=128)
- perms = models.CharField(max_length=128)
+ mode = models.CharField(max_length=128)
class Meta:
- unique_together = ('owner', 'group', 'perms')
+ unique_together = ('owner', 'group', 'mode')
def empty(self):
"""Return true if we have no real data"""
- if self.owner or self.group or self.perms:
+ if self.owner or self.group or self.mode:
return False
else:
return True
@@ -522,10 +522,10 @@ class PathEntry(SuccessEntry):
ENTRY_TYPE = r"Path"
- def perms_problem(self):
+ def mode_problem(self):
if self.current_perms.empty():
return False
- elif self.target_perms.perms != self.current_perms.perms:
+ elif self.target_perms.mode != self.current_perms.mode:
return True
else:
return False
@@ -553,8 +553,8 @@ class PathEntry(SuccessEntry):
rv = super(PathEntry, self).short_list()
if self.is_extra():
return rv
- if self.perms_problem():
- rv.append("File permissions")
+ if self.modes_problem():
+ rv.append("File mode")
if self.detail_type == PathEntry.DETAIL_PRUNED:
rv.append("Directory has extra files")
elif self.detail_type != PathEntry.DETAIL_UNUSED: