From dfc7e6760918b65779044531abfa3b69996f61c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Tue, 27 Sep 2005 20:36:37 +0000 Subject: [PATCH] * build no'yu duzgun oku (commit etmeyi unutmusum) * file not found error'ini daha bilgilendirici yap --- pisi/actionsapi/shelltools.py | 4 ++-- pisi/build.py | 1 + pisi/metadata.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pisi/actionsapi/shelltools.py b/pisi/actionsapi/shelltools.py index a568290b..2824d0b1 100644 --- a/pisi/actionsapi/shelltools.py +++ b/pisi/actionsapi/shelltools.py @@ -115,9 +115,9 @@ def copy(sourceFile, destinationFile): try: shutil.copy(file, destinationFile) except IOError: - ctx.ui.error(' ActionsAPI [copy]: Permission denied.') + ctx.ui.error('ActionsAPI [copy]: Permission denied.') else: - ctx.ui.error(' ActionsAPI [copy]: File doesn\'t exists.') + ctx.ui.error('ActionsAPI [copy]: File %s does not exist.' % file) def copytree(source, destination, sym = False): '''recursively copy an entire directory tree rooted at source''' diff --git a/pisi/build.py b/pisi/build.py index f0e0fd9c..4fa8238b 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -372,6 +372,7 @@ class PisiBuild: ctx.ui.warning('(no previous build found, setting build no to 0.)') else: a = filter(lambda (x,y): y != None, found) + ctx.ui.debug(str(a)) if a: a.sort(lambda x,y : cmp(x[1],y[1])) old_package_fn = a[0][0] diff --git a/pisi/metadata.py b/pisi/metadata.py index 1907a3d6..6aa2bdcb 100644 --- a/pisi/metadata.py +++ b/pisi/metadata.py @@ -52,7 +52,8 @@ class PackageInfo(specfile.PackageInfo): specfile.PackageInfo.__init__(self, node) self.version = getNodeText(node, "History/Update/Version") self.release = getNodeText(node, "History/Update/Release") - build_ = getNodeText(node, "History/Update/Build") + #FIXME: Support Build No under History/Update/Build + build_ = getNodeText(node, "Build") if build_ != None: self.build = int(build_) else: