From cde9cd35872d161ea996aeb8fc9d08102a35e872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= <baris@pardus.org.tr>
Date: Fri, 29 Jul 2005 20:35:34 +0000
Subject: [PATCH] =?UTF-8?q?-=20AdditionalFile'dan=20owner=20kald=C4=B1r?=
 =?UTF-8?q?=C4=B1ld=C4=B1.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- specfile'da bazı sınıflar için __str__'ler tanımlandı.
---
 pisi/build.py    |  6 ------
 pisi/specfile.py | 37 ++++++++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/pisi/build.py b/pisi/build.py
index 920b3961..acda5b08 100644
--- a/pisi/build.py
+++ b/pisi/build.py
@@ -287,12 +287,6 @@ class PisiBuild:
                 util.copy_file(src, dest)
                 if afile.permission:
                     os.chmod(dest, int(afile.permission) | 0777)
-                if afile.owner:
-                    #FIXME: Additional dosyalar icin owner'in set edilmesi
-                    # gerekli.. Bununla beraber tag'in owner yerine, 
-                    # owneruid - ownergid seklinde tutulmasi daha iyi
-                    # degil mi? Unutmayalim diye buraya bir FIXME koydum.
-                    pass
 	
             os.chdir(c)
 
diff --git a/pisi/specfile.py b/pisi/specfile.py
index 990fc5f4..dfd35139 100644
--- a/pisi/specfile.py
+++ b/pisi/specfile.py
@@ -32,15 +32,16 @@ class PackagerInfo:
         if not self.email: return False
         return True
 
+    def __str__(self):
+        s = " ".join(self.name, self.email)
+        return s
+
 class AdditionalFileInfo:
     def __init__(self, node = None):
         if node:
             self.filename = getNodeText(node)
             self.target = getNodeAttribute(node, "target")
             self.permission = getNodeAttribute(node, "permission")
-            self.owner = getNodeAttribute(node, "owner")
-        else:
-            self.permission = self.owner = None
 
     def elt(self, xml):
         node = xml.newNode("AdditionalFile")
@@ -48,14 +49,17 @@ class AdditionalFileInfo:
         node.setAttribute("target", self.target)
         if self.permission:
             node.setAttribute("permission", self.permission)
-        if self.owner:
-            node.setAttribute("owner", self.owner)
 
     def verify(self):
         if not self.filename: return False
         if not self.target: return False
         return True
 
+    def __str__(self):
+        s = "->".join(self.filename, self.target)
+        s += s + '(' + self.permission + ')'
+        return s
+
 class PatchInfo:
     def __init__(self, node = None):
         if node:
@@ -82,6 +86,12 @@ class PatchInfo:
         if not self.filename: return False
         return True
 
+    def __str__(self):
+        s = self.filename
+        s += ' (' + self.compressionType + ')'
+        s += ' level:' + self.level
+        return s
+
 class DepInfo:
     def __init__(self, node = None):
         if node:
@@ -162,6 +172,13 @@ class UpdateInfo:
         if not self.release: return False
         return True
 
+    def __str__(self):
+        s = self.date
+        s += ", ver=" + self.version
+        s += ", rel=" + self.release
+        s += ", type=" + self.type
+        return s
+
 class PathInfo:
     def __init__(self, node = None):
         if node:
@@ -180,6 +197,11 @@ class PathInfo:
         if not self.pathname: return False
         return True
 
+    def __str__(self):
+        s = self.pathname
+        s += ", type=" + self.fileType
+        return s
+
 class ComarProvide:
     def __init__(self, node = None):
         if node:
@@ -197,6 +219,11 @@ class ComarProvide:
             return False
         return True
 
+    def __str__(self):
+        s = self.script
+        s += ' (' + self.om + ')'
+        return s
+
 class SourceInfo:
     """A structure to hold source information. Source information is
     located under <Source> tag in PSPEC file."""