From 001120133e89016fc071305660b860c7402a045e Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Fri, 28 May 2010 12:10:35 +0100
Subject: [PATCH] Version 2010-05-28 13:10
---
src/mio/exception.py | 4 ++--
src/mio/node.py | 2 ++
src/mio/rpmDB.py | 8 --------
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/mio/exception.py b/src/mio/exception.py
index 7a161c9..8c25ee8 100755
--- a/src/mio/exception.py
+++ b/src/mio/exception.py
@@ -29,8 +29,8 @@ class SourceException(InstallerException):
def __init__(self, decl_1, decl_2):
self._1 = decl_1
self._2 = decl_2
- self.value_1 = "'%s'" % (decl_1.decl.source[0] or "")
- self.value_2 = "'%s'" % (decl_2.decl.source[0] or "")
+ self.value_1 = "'%s'" % (decl_1.decl.source[0] or decl_1.name or "")
+ self.value_2 = "'%s'" % (decl_2.decl.source[0] or decl_2.name or "")
class ModeException(InstallerException):
def __init__(self, decl_1, decl_2):
diff --git a/src/mio/node.py b/src/mio/node.py
index 6423264..d926e6b 100755
--- a/src/mio/node.py
+++ b/src/mio/node.py
@@ -240,6 +240,8 @@ class file_node(target_node):
raise ModeException(self, other)
if self.decl.source[0] != other.decl.source[0]:
raise SourceException(self, other)
+ if self.decl.files[0:] != other.decl.files[0:]:
+ raise SourceException(self, other)
if self.uid != other.uid:
raise OwnerException(self, other)
if self.gid != other.gid:
diff --git a/src/mio/rpmDB.py b/src/mio/rpmDB.py
index ea69d18..15908fa 100755
--- a/src/mio/rpmDB.py
+++ b/src/mio/rpmDB.py
@@ -9,14 +9,6 @@ class VersionDB:
def __init__(self):
self.rpm = {}
try:
- #rpmdb = rpmUtils.RpmDBHolder()
- #read_ts = rpmUtils.transaction.initReadOnlyTransaction()
- #rpmdb.addDB(read_ts)
- #for (name, arch, epoch, version, release) in rpmdb.getPkgList():
- # self.rpm[name] = (name, arch, version, release)
- #del rpmdb
- #del read_ts.ts
- #del read_ts
read_ts = rpmUtils.transaction.initReadOnlyTransaction()
for e in read_ts.dbMatch():
(name, arch, version, release) = (
--
GitLab