* Çağlar's special request. fetch state before unpack.
WARNING: clear /var/tmp/pisi state numbers and order has changed...
This commit is contained in:
+18
-10
@@ -860,23 +860,27 @@ def build(pspec):
|
|||||||
return pb.build()
|
return pb.build()
|
||||||
|
|
||||||
order = {"none": 0,
|
order = {"none": 0,
|
||||||
"unpack": 1,
|
"fetch": 1,
|
||||||
"setupaction": 2,
|
"unpack": 2,
|
||||||
"buildaction": 3,
|
"setupaction": 3,
|
||||||
"installaction": 4,
|
"buildaction": 4,
|
||||||
"buildpackages": 5}
|
"installaction": 5,
|
||||||
|
"buildpackages": 6}
|
||||||
|
|
||||||
def __buildState_unpack(pb):
|
def __buildState_fetch(pb):
|
||||||
# unpack is the first state to run.
|
# fetch is the first state to run.
|
||||||
pb.patch_exists()
|
pb.patch_exists()
|
||||||
pb.fetch_source_archive()
|
pb.fetch_source_archive()
|
||||||
|
|
||||||
|
def __buildState_unpack(pb, last):
|
||||||
|
if order[last] < order["fetch"]:
|
||||||
|
__buildState_fetch(pb)
|
||||||
pb.unpack_source_archive()
|
pb.unpack_source_archive()
|
||||||
pb.apply_patches()
|
pb.apply_patches()
|
||||||
|
|
||||||
def __buildState_setupaction(pb, last):
|
def __buildState_setupaction(pb, last):
|
||||||
|
|
||||||
if order[last] < order["unpack"]:
|
if order[last] < order["unpack"]:
|
||||||
__buildState_unpack(pb)
|
__buildState_unpack(pb, last)
|
||||||
pb.run_setup_action()
|
pb.run_setup_action()
|
||||||
|
|
||||||
def __buildState_buildaction(pb, last):
|
def __buildState_buildaction(pb, last):
|
||||||
@@ -910,8 +914,12 @@ def build_until(pspec, state):
|
|||||||
|
|
||||||
if not last: last = "none"
|
if not last: last = "none"
|
||||||
|
|
||||||
|
if state == "fetch":
|
||||||
|
__buildState_fetch(pb)
|
||||||
|
return
|
||||||
|
|
||||||
if state == "unpack":
|
if state == "unpack":
|
||||||
__buildState_unpack(pb)
|
__buildState_unpack(pb, last)
|
||||||
return
|
return
|
||||||
|
|
||||||
if state == "setup":
|
if state == "setup":
|
||||||
|
|||||||
@@ -367,7 +367,7 @@ unpack, setup, build, install, package.
|
|||||||
|
|
||||||
name = ("build", "bi")
|
name = ("build", "bi")
|
||||||
|
|
||||||
steps = ('unpack', 'setup', 'build', 'install', 'package')
|
steps = ('fetch', 'unpack', 'setup', 'build', 'install', 'package')
|
||||||
|
|
||||||
package_formats = ('1.0', '1.1')
|
package_formats = ('1.0', '1.1')
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user