Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

history: Remove buildno-related stuff

Browse Source
This commit is contained in:
Fatih Aşıcı
2010-10-06 21:54:06 +00:00
parent 928ca84a9c
commit 4e3c38e0ab
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/history.py
+2 -4
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- 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 # 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 # 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_version = [autoxml.String, autoxml.mandatory]
a_release = [autoxml.String, autoxml.mandatory] a_release = [autoxml.String, autoxml.mandatory]
a_build = [autoxml.String, autoxml.optional]
def __str__(self): def __str__(self):
return self.version + "-" + self.release + "-" + (self.build or '?') return self.version + "-" + self.release
class Repo: class Repo:
a_operation = [autoxml.String, autoxml.mandatory] a_operation = [autoxml.String, autoxml.mandatory]
@@ -137,7 +136,6 @@ class History(xmlfile.XmlFile):
if pkgInfo: if pkgInfo:
histInfo.version = str(pkgInfo.version) histInfo.version = str(pkgInfo.version)
histInfo.release = str(pkgInfo.release) histInfo.release = str(pkgInfo.release)
histInfo.build = pkgInfo.build and str(pkgInfo.build)
self.operation.packages.append(package) self.operation.packages.append(package)
pisi/operations/history.py
+2 -6
View File
@@ -28,12 +28,8 @@ def __pkg_already_installed(name, pkginfo):
if not installdb.has_package(name): if not installdb.has_package(name):
return False return False
ver, rel, build = str(pkginfo).split("-") ver, rel = str(pkginfo).split("-")
if build == '?': return (ver, rel) == installdb.get_version(name)[:-1]
build = None
else:
build = int(build)
return (ver, rel, build) == installdb.get_version(name)
def __listactions(actions): def __listactions(actions):