From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 1 Oct 2022 13:45:10 +0000 (+0000)
Subject: file: Found more places to replace uname/gname
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bd0cb28fe6a089173accab647be6cf59ddb7a17;p=pbs.git

file: Found more places to replace uname/gname

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py
index 552a6646..644f78fe 100644
--- a/src/buildservice/packages.py
+++ b/src/buildservice/packages.py
@@ -523,12 +523,12 @@ class File(base.Object):
 		return self.data.mode
 
 	@property
-	def user(self):
-		return self.data.user
+	def uname(self):
+		return self.data.uname
 
 	@property
-	def group(self):
-		return self.data.group
+	def gname(self):
+		return self.data.gname
 
 	@property
 	def ctime(self):
diff --git a/src/templates/modules/packages-files-table.html b/src/templates/modules/packages-files-table.html
index 8b3c1025..7157ad43 100644
--- a/src/templates/modules/packages-files-table.html
+++ b/src/templates/modules/packages-files-table.html
@@ -6,7 +6,7 @@
 			<tr>
 				<td>
 					{% set mode  = stat.filemode(file.mode) %}
-					{% set owner = "%6s:%-6s" % (file.user, file.group) %}
+					{% set owner = "%6s:%-6s" % (file.uname, file.gname) %}
 					{% set size  = "%6s" % ("-" if file.size is None else format_size(file.size)) %}
 
 					<pre>{{ mode }} {{ owner }} {{ size }} {{ file.path }}</pre>