From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 21 Jun 2022 14:07:32 +0000 (+0000)
Subject: packages: Replace epoch/version/release with EVR
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bdb1f718bacfe7d819d3e9c215a582bba587195;p=pbs.git

packages: Replace epoch/version/release with EVR

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

diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py
index 7c5c5b5e..46f2e5f5 100644
--- a/src/buildservice/packages.py
+++ b/src/buildservice/packages.py
@@ -165,7 +165,7 @@ class Package(base.DataObject):
 		return "<%s %s>" % (self.__class__.__name__, self.friendly_name)
 
 	def __str__(self):
-		return self.friendly_name
+		return "%s-%s.%s" % (self.name, self.evr, self.arch)
 
 	def __lt__(self, other):
 		if isinstance(other, self.__class__):
@@ -193,38 +193,13 @@ class Package(base.DataObject):
 		return self.data.name
 
 	@property
-	def epoch(self):
-		return self.data.epoch
-
-	@property
-	def version(self):
-		return self.data.version
-
-	@property
-	def release(self):
-		return self.data.release
+	def evr(self):
+		return self.data.evr
 
 	@property
 	def arch(self):
 		return self.data.arch
 
-	@property
-	def type(self):
-		return self.data.type
-
-	@property
-	def friendly_name(self):
-		return "%s-%s.%s" % (self.name, self.friendly_version, self.arch)
-
-	@property
-	def friendly_version(self):
-		s = "%s-%s" % (self.version, self.release)
-
-		if self.epoch:
-			s = "%s:%s" % (self.epoch, s)
-
-		return s
-
 	@property
 	def groups(self):
 		return self.data.groups.split()
diff --git a/src/database.sql b/src/database.sql
index e05adb33..c89c3c42 100644
--- a/src/database.sql
+++ b/src/database.sql
@@ -917,10 +917,7 @@ ALTER SEQUENCE public.mirrors_id_seq OWNED BY public.mirrors.id;
 CREATE TABLE public.packages (
     id integer NOT NULL,
     name text NOT NULL,
-    epoch integer NOT NULL,
-    version text NOT NULL,
-    release text NOT NULL,
-    type text NOT NULL,
+    evr text NOT NULL,
     arch text NOT NULL,
     groups text NOT NULL,
     maintainer text NOT NULL,
@@ -2169,13 +2166,6 @@ CREATE UNIQUE INDEX idx_2198094_fingerprint ON public.keys USING btree (fingerpr
 CREATE INDEX idx_2198132_name ON public.packages USING btree (name);
 
 
---
--- Name: idx_2198132_type; Type: INDEX; Schema: public; Owner: pakfire
---
-
-CREATE INDEX idx_2198132_type ON public.packages USING btree (type);
-
-
 --
 -- Name: idx_2198132_uuid; Type: INDEX; Schema: public; Owner: pakfire
 --