Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #2317

Browse Source
This commit is contained in:
A. Murat Eren
2006-03-16 10:34:37 +00:00
parent 07e7053b85
commit ddcec52036
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/build.py
+13 -13
View File
@@ -324,16 +324,17 @@ class Builder:
self.run_action_function(ctx.const.install_func, True) self.run_action_function(ctx.const.install_func, True)
self.set_state("installaction") self.set_state("installaction")
def check_abandoned_files(self): def get_abandoned_files(self):
# show the files those are not collected from the install dir # return the files those are not collected from the install dir
install_dir = self.pkg_dir() + ctx.const.install_dir_suffix install_dir = self.pkg_dir() + ctx.const.install_dir_suffix
abandoned_files = [] abandoned_files = []
all_paths_in_packages = [] all_paths_in_packages = []
for package in self.spec.packages: for package in self.spec.packages:
for path in package.files: for path in package.files:
all_paths_in_packages.append(util.join_path(install_dir + path.path)) map(lambda p: all_paths_in_packages.append(p), [p for p in glob.glob(install_dir + path.path)])
for root, dirs, files in os.walk(install_dir): for root, dirs, files in os.walk(install_dir):
for file_ in files: for file_ in files:
@@ -345,14 +346,7 @@ class Builder:
if not already_in_package: if not already_in_package:
abandoned_files.append(fpath) abandoned_files.append(fpath)
if abandoned_files: return abandoned_files
ctx.ui.warning(_('Abandoned files under the install dir (%s):' \
% (install_dir)))
for f in abandoned_files:
ctx.ui.info(' - %s' % (f))
else:
ctx.ui.info(_('All of the files under the install dir (%s) has been collected by package(s)' \
% (install_dir)))
def compile_action_script(self): def compile_action_script(self):
@@ -719,8 +713,14 @@ class Builder:
#show the files those are not collected from the install dir #show the files those are not collected from the install dir
if ctx.get_option('show_abandoned_files') or ctx.get_option('debug'): if ctx.get_option('show_abandoned_files') or ctx.get_option('debug'):
self.check_abandoned_files() abandoned_files = self.get_abandoned_files()
if abandoned_files:
ctx.ui.warning(_('Abandoned files under the install dir (%s):' % (install_dir)))
for f in abandoned_files:
ctx.ui.info(' - %s' % (f))
else:
ctx.ui.warning(_('All of the files under the install dir (%s) has been collected by package(s)' \
% (install_dir)))
if ctx.config.values.general.autoclean is True: if ctx.config.values.general.autoclean is True:
ctx.ui.info(_("Cleaning Build Directory...")) ctx.ui.info(_("Cleaning Build Directory..."))