sys is not used, drop unused install_dir parameter and old_package_name variable
This commit is contained in:
@@ -14,7 +14,6 @@
|
|||||||
# python standard library
|
# python standard library
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import sys
|
|
||||||
import glob
|
import glob
|
||||||
import stat
|
import stat
|
||||||
import pwd
|
import pwd
|
||||||
@@ -93,7 +92,7 @@ def check_path_collision(package, pkgList):
|
|||||||
path.path)
|
path.path)
|
||||||
return collisions
|
return collisions
|
||||||
|
|
||||||
def exclude_special_files(filepath, fileinfo, install_dir, ag):
|
def exclude_special_files(filepath, fileinfo, ag):
|
||||||
keeplist = [] if not ag.has_key('KeepSpecial') else ag['KeepSpecial']
|
keeplist = [] if not ag.has_key('KeepSpecial') else ag['KeepSpecial']
|
||||||
patterns = {
|
patterns = {
|
||||||
"libtool":".*: libtool library file",
|
"libtool":".*: libtool library file",
|
||||||
@@ -849,7 +848,7 @@ class Builder:
|
|||||||
filepath = pisi.util.join_path(root, fn)
|
filepath = pisi.util.join_path(root, fn)
|
||||||
fileinfo = ms.file(filepath)
|
fileinfo = ms.file(filepath)
|
||||||
strip_debug_action(filepath, fileinfo, install_dir, self.actionGlobals)
|
strip_debug_action(filepath, fileinfo, install_dir, self.actionGlobals)
|
||||||
exclude_special_files(filepath, fileinfo, install_dir, self.actionGlobals)
|
exclude_special_files(filepath, fileinfo, self.actionGlobals)
|
||||||
|
|
||||||
ms.close()
|
ms.close()
|
||||||
locale.setlocale(locale.LC_ALL, '')
|
locale.setlocale(locale.LC_ALL, '')
|
||||||
@@ -898,9 +897,6 @@ class Builder:
|
|||||||
if not package.icon:
|
if not package.icon:
|
||||||
package.icon = self.spec.source.icon
|
package.icon = self.spec.source.icon
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
old_package_name = None
|
|
||||||
# store additional files
|
# store additional files
|
||||||
c = os.getcwd()
|
c = os.getcwd()
|
||||||
os.chdir(self.specdir)
|
os.chdir(self.specdir)
|
||||||
|
|||||||
Reference in New Issue
Block a user