diff --git a/pisi/actionsapi/pisitools.py b/pisi/actionsapi/pisitools.py index d69e3f94..04a263a8 100644 --- a/pisi/actionsapi/pisitools.py +++ b/pisi/actionsapi/pisitools.py @@ -98,7 +98,7 @@ def dolib(sourceFile, destinationDirectory = '/usr/lib'): sourceFile = join_path(os.getcwd(), sourceFile) destinationDirectory = join_path(get.installDIR(), destinationDirectory) - lib_insinto(sourceFile, destinationDirectory, 755) + lib_insinto(sourceFile, destinationDirectory, 0755) def dolib_a(sourceFile, destinationDirectory = '/usr/lib'): '''insert the static library into /usr/lib with permission 0644''' @@ -107,7 +107,7 @@ def dolib_a(sourceFile, destinationDirectory = '/usr/lib'): sourceFile = join_path(os.getcwd(), sourceFile) destinationDirectory = join_path(get.installDIR(), destinationDirectory) - lib_insinto(sourceFile, destinationDirectory, 644) + lib_insinto(sourceFile, destinationDirectory, 0644) def dolib_so(sourceFile, destinationDirectory = '/usr/lib'): '''insert the static library into /usr/lib with permission 0755''' @@ -116,7 +116,7 @@ def dolib_so(sourceFile, destinationDirectory = '/usr/lib'): sourceFile = join_path(os.getcwd(), sourceFile) destinationDirectory = join_path(get.installDIR(), destinationDirectory) - lib_insinto(sourceFile, destinationDirectory, 755) + lib_insinto(sourceFile, destinationDirectory, 0755) def doman(*sourceFiles): '''inserts the man pages in the list of files into /usr/share/man/''' diff --git a/pisi/actionsapi/pisitoolsfunctions.py b/pisi/actionsapi/pisitoolsfunctions.py index 44b88984..a372a501 100644 --- a/pisi/actionsapi/pisitoolsfunctions.py +++ b/pisi/actionsapi/pisitoolsfunctions.py @@ -85,4 +85,4 @@ def lib_insinto(sourceFile, destinationDirectory, permission = 0644): if os.path.islink(sourceFile): os.symlink(os.path.realpath(sourceFile), os.path.join(destinationDirectory, sourceFile)) else: - system('install -m%s %s %s' % (permission, sourceFile, destinationDirectory)) + system('install -m0%o %s %s' % (permission, sourceFile, destinationDirectory)) diff --git a/pisi/actionsapi/shelltools.py b/pisi/actionsapi/shelltools.py index 9700990c..430032f3 100644 --- a/pisi/actionsapi/shelltools.py +++ b/pisi/actionsapi/shelltools.py @@ -67,7 +67,7 @@ def chmod(filePath, mode = 0755): try: os.chmod(fileName, mode) except OSError: - ctx.ui.error(_('ActionsAPI [chmod]: Operation not permitted: %s (mode: %s)') \ + ctx.ui.error(_('ActionsAPI [chmod]: Operation not permitted: %s (mode: 0%o)') \ % (fileName, mode)) else: ctx.ui.error(_('ActionsAPI [chmod]: File %s doesn\'t exists.') % (fileName))