From 4e3c38e0abdff92d8cce21aeca6143848ace2275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih@pardus.org.tr>
Date: Wed, 6 Oct 2010 21:54:06 +0000
Subject: [PATCH] history: Remove buildno-related stuff

---
 pisi/history.py            | 6 ++----
 pisi/operations/history.py | 8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pisi/history.py b/pisi/history.py
index 283fc553..b7b54fcd 100644
--- a/pisi/history.py
+++ b/pisi/history.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008, TUBITAK/UEKAE
+# Copyright (C) 2008-2010, TUBITAK/UEKAE
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
@@ -26,10 +26,9 @@ class PackageInfo:
 
     a_version = [autoxml.String, autoxml.mandatory]
     a_release = [autoxml.String, autoxml.mandatory]
-    a_build = [autoxml.String, autoxml.optional]
 
     def __str__(self):
-        return self.version + "-" + self.release + "-" + (self.build or '?')
+        return self.version + "-" + self.release
 
 class Repo:
     a_operation = [autoxml.String, autoxml.mandatory]
@@ -137,7 +136,6 @@ class History(xmlfile.XmlFile):
             if pkgInfo:
                 histInfo.version = str(pkgInfo.version)
                 histInfo.release = str(pkgInfo.release)
-                histInfo.build = pkgInfo.build and str(pkgInfo.build)
 
         self.operation.packages.append(package)
 
diff --git a/pisi/operations/history.py b/pisi/operations/history.py
index 5ebd157a..39780fcd 100644
--- a/pisi/operations/history.py
+++ b/pisi/operations/history.py
@@ -28,12 +28,8 @@ def __pkg_already_installed(name, pkginfo):
     if not installdb.has_package(name):
         return False
 
-    ver, rel, build = str(pkginfo).split("-")
-    if build == '?':
-        build = None
-    else:
-        build = int(build)
-    return (ver, rel, build) == installdb.get_version(name)
+    ver, rel = str(pkginfo).split("-")
+    return (ver, rel) == installdb.get_version(name)[:-1]
 
 def __listactions(actions):