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

build: Minor simplifications

Browse Source
This commit is contained in:
Fatih Aşıcı
2011-02-19 14:28:18 +00:00
parent bf231dcd18
commit 36cd35fb86
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/operations/build.py
+7 -9
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Copyright (C) 2005-2010, TUBITAK/UEKAE # Copyright (C) 2005-2011, TUBITAK/UEKAE
# #
# This program is free software; you can redistribute it and/or modify it under # This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free # the terms of the GNU General Public License as published by the Free
@@ -398,19 +398,17 @@ class Builder:
pass pass
def fetch_patches(self): def fetch_patches(self):
spec = self.spec for patch in self.spec.source.patches:
for patch in spec.source.patches:
file_name = os.path.basename(patch.filename)
dir_name = os.path.dirname(patch.filename) dir_name = os.path.dirname(patch.filename)
patchuri = util.join_path(self.specdiruri, patchuri = util.join_path(self.specdiruri,
ctx.const.files_dir, dir_name, file_name) ctx.const.files_dir,
patch.filename)
self.download(patchuri, util.join_path(self.destdir, self.download(patchuri, util.join_path(self.destdir,
ctx.const.files_dir, ctx.const.files_dir,
dir_name)) dir_name))
def fetch_comarfiles(self): def fetch_comarfiles(self):
spec = self.spec for package in self.spec.packages:
for package in spec.packages:
for pcomar in package.providesComar: for pcomar in package.providesComar:
comaruri = util.join_path(self.specdiruri, comaruri = util.join_path(self.specdiruri,
ctx.const.comar_dir, pcomar.script) ctx.const.comar_dir, pcomar.script)
@@ -505,7 +503,7 @@ class Builder:
def get_abandoned_files(self): def get_abandoned_files(self):
# return 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_install_dir()
abandoned_files = [] abandoned_files = []
all_paths_in_packages = [] all_paths_in_packages = []
@@ -948,7 +946,7 @@ class Builder:
if debug_packages: if debug_packages:
self.spec.packages.extend(debug_packages) self.spec.packages.extend(debug_packages)
install_dir = self.pkg_dir() + ctx.const.install_dir_suffix install_dir = self.pkg_install_dir()
# Store additional files # Store additional files
c = os.getcwd() c = os.getcwd()