* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/
@ 2015-02-26 19:25 Brian Dolbec
2015-02-26 20:12 ` [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/ Brian Dolbec
0 siblings, 1 reply; 12+ messages in thread
From: Brian Dolbec @ 2015-02-26 19:25 UTC (permalink / raw
To: gentoo-commits
commit: f811fbc991ba1a9fef8e62f84ecc21e56d1191fb
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 06:32:49 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:03 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f811fbc9
Remove some dead code
---
catalyst/base/stagebase.py | 2 --
catalyst/targets/livecd_stage2.py | 2 --
2 files changed, 4 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index edb6032..f8443d8 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -508,8 +508,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
"setup_confdir","portage_overlay",\
"base_dirs","bind","chroot_setup","setup_environment",\
"run_local","preclean","unbind","clean"]
-# if "TARBALL" in self.settings or \
-# "fetch" not in self.settings["options"]:
if "fetch" not in self.settings["options"]:
self.settings["action_sequence"].append("capture")
self.settings["action_sequence"].append("clear_autoresume")
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 78bed82..38b6884 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -111,10 +111,8 @@ class livecd_stage2(StageBase):
self.mount_safety_check()
if invalid_snapshot:
print "No Valid Resume point detected, cleaning up ..."
- #os.remove(self.settings["autoresume_path"]+"dir_setup")
self.clear_autoresume()
self.clear_chroot()
- #self.dir_setup()
ensure_dirs(self.settings["chroot_path"]+"/tmp", mode=1777)
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/
2015-02-26 19:25 [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/ Brian Dolbec
@ 2015-02-26 20:12 ` Brian Dolbec
0 siblings, 0 replies; 12+ messages in thread
From: Brian Dolbec @ 2015-02-26 20:12 UTC (permalink / raw
To: gentoo-commits
commit: f811fbc991ba1a9fef8e62f84ecc21e56d1191fb
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 06:32:49 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:03 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f811fbc9
Remove some dead code
---
catalyst/base/stagebase.py | 2 --
catalyst/targets/livecd_stage2.py | 2 --
2 files changed, 4 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index edb6032..f8443d8 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -508,8 +508,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
"setup_confdir","portage_overlay",\
"base_dirs","bind","chroot_setup","setup_environment",\
"run_local","preclean","unbind","clean"]
-# if "TARBALL" in self.settings or \
-# "fetch" not in self.settings["options"]:
if "fetch" not in self.settings["options"]:
self.settings["action_sequence"].append("capture")
self.settings["action_sequence"].append("clear_autoresume")
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 78bed82..38b6884 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -111,10 +111,8 @@ class livecd_stage2(StageBase):
self.mount_safety_check()
if invalid_snapshot:
print "No Valid Resume point detected, cleaning up ..."
- #os.remove(self.settings["autoresume_path"]+"dir_setup")
self.clear_autoresume()
self.clear_chroot()
- #self.dir_setup()
ensure_dirs(self.settings["chroot_path"]+"/tmp", mode=1777)
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/
@ 2015-02-26 19:25 Brian Dolbec
2015-02-26 20:12 ` [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/ Brian Dolbec
0 siblings, 1 reply; 12+ messages in thread
From: Brian Dolbec @ 2015-02-26 19:25 UTC (permalink / raw
To: gentoo-commits
commit: 5c79385fc2a02d4e539ef5fe646397da98f72bde
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 07:31:59 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:20 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5c79385f
Rename local unpack var to _unpack
The method name was unpack, so rename the local var to _unpack to help avoid confusion.
---
catalyst/base/stagebase.py | 18 +++++++++---------
catalyst/targets/livecd_stage2.py | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index f8443d8..bdeaedd 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -662,7 +662,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
raise CatalystError("Unable to auto-unbind " + target)
def unpack(self):
- unpack=True
+ _unpack=True
clst_unpack_hash = self.resume.get("unpack")
@@ -712,49 +712,49 @@ class StageBase(TargetBase, ClearBase, GenBase):
if os.path.isdir(self.settings["source_path"]) \
and self.resume.is_enabled("unpack"):
""" Autoresume is valid, SEEDCACHE is valid """
- unpack=False
+ _unpack=False
invalid_snapshot=False
elif os.path.isfile(self.settings["source_path"]) \
and self.settings["source_path_hash"]==clst_unpack_hash:
""" Autoresume is valid, tarball is valid """
- unpack=False
+ _unpack=False
invalid_snapshot=True
elif os.path.isdir(self.settings["source_path"]) \
and self.resume.is_disabled("unpack"):
""" Autoresume is invalid, SEEDCACHE """
- unpack=True
+ _unpack=True
invalid_snapshot=False
elif os.path.isfile(self.settings["source_path"]) \
and self.settings["source_path_hash"]!=clst_unpack_hash:
""" Autoresume is invalid, tarball """
- unpack=True
+ _unpack=True
invalid_snapshot=True
else:
""" No autoresume, SEEDCACHE """
if "seedcache" in self.settings["options"]:
""" SEEDCACHE so let's run rsync and let it clean up """
if os.path.isdir(self.settings["source_path"]):
- unpack=True
+ _unpack=True
invalid_snapshot=False
elif os.path.isfile(self.settings["source_path"]):
""" Tarball so unpack and remove anything already there """
- unpack=True
+ _unpack=True
invalid_snapshot=True
""" No autoresume, no SEEDCACHE """
else:
""" Tarball so unpack and remove anything already there """
if os.path.isfile(self.settings["source_path"]):
- unpack=True
+ _unpack=True
invalid_snapshot=True
elif os.path.isdir(self.settings["source_path"]):
""" We should never reach this, so something is very wrong """
raise CatalystError(
"source path is a dir but seedcache is not enabled")
- if unpack:
+ if _unpack:
self.mount_safety_check()
if invalid_snapshot:
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 38b6884..45a6767 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -86,7 +86,7 @@ class livecd_stage2(StageBase):
myf.close()
def unpack(self):
- unpack=True
+ _unpack=True
display_msg=None
clst_unpack_hash = self.resume.get("unpack")
@@ -102,12 +102,12 @@ class livecd_stage2(StageBase):
if os.path.isdir(self.settings["source_path"]) and \
self.resume.is_enabled("unpack"):
print "Resume point detected, skipping unpack operation..."
- unpack=False
+ _unpack=False
elif "source_path_hash" in self.settings:
if self.settings["source_path_hash"] != clst_unpack_hash:
invalid_snapshot=True
- if unpack:
+ if _unpack:
self.mount_safety_check()
if invalid_snapshot:
print "No Valid Resume point detected, cleaning up ..."
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/
2015-02-26 19:25 [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/ Brian Dolbec
@ 2015-02-26 20:12 ` Brian Dolbec
0 siblings, 0 replies; 12+ messages in thread
From: Brian Dolbec @ 2015-02-26 20:12 UTC (permalink / raw
To: gentoo-commits
commit: 5c79385fc2a02d4e539ef5fe646397da98f72bde
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 07:31:59 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:20 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5c79385f
Rename local unpack var to _unpack
The method name was unpack, so rename the local var to _unpack to help avoid confusion.
---
catalyst/base/stagebase.py | 18 +++++++++---------
catalyst/targets/livecd_stage2.py | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index f8443d8..bdeaedd 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -662,7 +662,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
raise CatalystError("Unable to auto-unbind " + target)
def unpack(self):
- unpack=True
+ _unpack=True
clst_unpack_hash = self.resume.get("unpack")
@@ -712,49 +712,49 @@ class StageBase(TargetBase, ClearBase, GenBase):
if os.path.isdir(self.settings["source_path"]) \
and self.resume.is_enabled("unpack"):
""" Autoresume is valid, SEEDCACHE is valid """
- unpack=False
+ _unpack=False
invalid_snapshot=False
elif os.path.isfile(self.settings["source_path"]) \
and self.settings["source_path_hash"]==clst_unpack_hash:
""" Autoresume is valid, tarball is valid """
- unpack=False
+ _unpack=False
invalid_snapshot=True
elif os.path.isdir(self.settings["source_path"]) \
and self.resume.is_disabled("unpack"):
""" Autoresume is invalid, SEEDCACHE """
- unpack=True
+ _unpack=True
invalid_snapshot=False
elif os.path.isfile(self.settings["source_path"]) \
and self.settings["source_path_hash"]!=clst_unpack_hash:
""" Autoresume is invalid, tarball """
- unpack=True
+ _unpack=True
invalid_snapshot=True
else:
""" No autoresume, SEEDCACHE """
if "seedcache" in self.settings["options"]:
""" SEEDCACHE so let's run rsync and let it clean up """
if os.path.isdir(self.settings["source_path"]):
- unpack=True
+ _unpack=True
invalid_snapshot=False
elif os.path.isfile(self.settings["source_path"]):
""" Tarball so unpack and remove anything already there """
- unpack=True
+ _unpack=True
invalid_snapshot=True
""" No autoresume, no SEEDCACHE """
else:
""" Tarball so unpack and remove anything already there """
if os.path.isfile(self.settings["source_path"]):
- unpack=True
+ _unpack=True
invalid_snapshot=True
elif os.path.isdir(self.settings["source_path"]):
""" We should never reach this, so something is very wrong """
raise CatalystError(
"source path is a dir but seedcache is not enabled")
- if unpack:
+ if _unpack:
self.mount_safety_check()
if invalid_snapshot:
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 38b6884..45a6767 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -86,7 +86,7 @@ class livecd_stage2(StageBase):
myf.close()
def unpack(self):
- unpack=True
+ _unpack=True
display_msg=None
clst_unpack_hash = self.resume.get("unpack")
@@ -102,12 +102,12 @@ class livecd_stage2(StageBase):
if os.path.isdir(self.settings["source_path"]) and \
self.resume.is_enabled("unpack"):
print "Resume point detected, skipping unpack operation..."
- unpack=False
+ _unpack=False
elif "source_path_hash" in self.settings:
if self.settings["source_path_hash"] != clst_unpack_hash:
invalid_snapshot=True
- if unpack:
+ if _unpack:
self.mount_safety_check()
if invalid_snapshot:
print "No Valid Resume point detected, cleaning up ..."
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/, catalyst/base/
@ 2015-02-26 20:44 Brian Dolbec
2015-02-26 22:18 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
0 siblings, 1 reply; 12+ messages in thread
From: Brian Dolbec @ 2015-02-26 20:44 UTC (permalink / raw
To: gentoo-commits
commit: 5b08b471611670b4cc996e45c387ecd951fb2142
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 14:40:12 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:58:28 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5b08b471
Fix livecd source and target paths not ending with a slash
---
catalyst/base/stagebase.py | 2 +-
catalyst/targets/livecd_stage1.py | 3 +--
catalyst/targets/livecd_stage2.py | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index bdeaedd..eec74df 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -294,7 +294,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_target_subpath(self):
self.settings["target_subpath"]=self.settings["rel_type"]+"/"+\
self.settings["target"]+"-"+self.settings["subarch"]+"-"+\
- self.settings["version_stamp"]
+ self.settings["version_stamp"] +'/'
def set_source_subpath(self):
if type(self.settings["source_subpath"])!=types.StringType:
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
index 55859bc..8402e7a 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -33,7 +33,7 @@ class livecd_stage1(StageBase):
"unbind", "clean","clear_autoresume"]
def set_target_path(self):
- self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
+ self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+'/')
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("setup_target_path"):
print "Resume point detected, skipping target path setup operation..."
@@ -43,7 +43,6 @@ class livecd_stage1(StageBase):
cmd("rm -rf "+self.settings["target_path"],\
"Could not remove existing directory: "+self.settings["target_path"],env=self.env)
self.resume.enable("setup_target_path")
-
ensure_dirs(self.settings["target_path"])
def set_spec_prefix(self):
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 45a6767..55e6897 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -43,7 +43,7 @@ class livecd_stage2(StageBase):
self.settings["hash_map"].generate_hash(
self.settings["source_path"])
else:
- self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"])
+ self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+'/')
if not os.path.exists(self.settings["source_path"]):
raise CatalystError("Source Path: " +
self.settings["source_path"] + " does not exist.",
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/
2015-02-26 20:44 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
@ 2015-02-26 22:18 ` Brian Dolbec
0 siblings, 0 replies; 12+ messages in thread
From: Brian Dolbec @ 2015-02-26 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 5b08b471611670b4cc996e45c387ecd951fb2142
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 14:40:12 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:58:28 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5b08b471
Fix livecd source and target paths not ending with a slash
---
catalyst/base/stagebase.py | 2 +-
catalyst/targets/livecd_stage1.py | 3 +--
catalyst/targets/livecd_stage2.py | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index bdeaedd..eec74df 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -294,7 +294,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_target_subpath(self):
self.settings["target_subpath"]=self.settings["rel_type"]+"/"+\
self.settings["target"]+"-"+self.settings["subarch"]+"-"+\
- self.settings["version_stamp"]
+ self.settings["version_stamp"] +'/'
def set_source_subpath(self):
if type(self.settings["source_subpath"])!=types.StringType:
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
index 55859bc..8402e7a 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -33,7 +33,7 @@ class livecd_stage1(StageBase):
"unbind", "clean","clear_autoresume"]
def set_target_path(self):
- self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
+ self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+'/')
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("setup_target_path"):
print "Resume point detected, skipping target path setup operation..."
@@ -43,7 +43,6 @@ class livecd_stage1(StageBase):
cmd("rm -rf "+self.settings["target_path"],\
"Could not remove existing directory: "+self.settings["target_path"],env=self.env)
self.resume.enable("setup_target_path")
-
ensure_dirs(self.settings["target_path"])
def set_spec_prefix(self):
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 45a6767..55e6897 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -43,7 +43,7 @@ class livecd_stage2(StageBase):
self.settings["hash_map"].generate_hash(
self.settings["source_path"])
else:
- self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"])
+ self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+'/')
if not os.path.exists(self.settings["source_path"]):
raise CatalystError("Source Path: " +
self.settings["source_path"] + " does not exist.",
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/
@ 2015-02-26 20:44 Brian Dolbec
2015-02-26 22:18 ` [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/ Brian Dolbec
0 siblings, 1 reply; 12+ messages in thread
From: Brian Dolbec @ 2015-02-26 20:44 UTC (permalink / raw
To: gentoo-commits
commit: 7c94f3f7e2dce6860e847c841cdcfc6f3d41f3db
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 23:41:39 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 20:00:56 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7c94f3f7
Strip trailing slash from subpath's if they exist when creating filenames.
This bug was introduced in commit 52c9d37ff5de18981d6ecbe5bdde524b2bf4ebda when a trailing slash was added to target_subpath.
---
catalyst/base/stagebase.py | 10 +++++-----
catalyst/targets/livecd_stage2.py | 2 +-
catalyst/targets/stage2.py | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index eec74df..7395351 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -323,7 +323,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_target_path(self):
self.settings["target_path"]=normpath(self.settings["storedir"]+\
- "/builds/"+self.settings["target_subpath"]+".tar.bz2")
+ "/builds/"+self.settings["target_subpath"].rstrip('/')+".tar.bz2")
if "autoresume" in self.settings["options"]\
and self.resume.is_enabled("setup_target_path"):
print \
@@ -407,7 +407,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
"/tmp/" + self.settings["source_subpath"] + "/")
else:
self.settings["source_path"]=normpath(self.settings["storedir"]+\
- "/builds/"+self.settings["source_subpath"]+".tar.bz2")
+ "/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2")
if os.path.isfile(self.settings["source_path"]):
# XXX: Is this even necessary if the previous check passes?
if os.path.exists(self.settings["source_path"]):
@@ -422,7 +422,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
print "\tseedcache in the options of catalyst.conf the source path"
print "\twill then be "+\
normpath(self.settings["storedir"]+"/builds/"+\
- self.settings["source_subpath"]+".tar.bz2\n")
+ self.settings["source_subpath"].rstrip('/')+".tar.bz2\n")
def set_dest_path(self):
if "root_path" in self.settings:
@@ -438,7 +438,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_snapshot_path(self):
self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\
"/snapshots/" + self.settings["snapshot_name"] +
- self.settings["snapshot"] + ".tar.xz")
+ self.settings["snapshot"].rstrip('/')+".tar.xz")
if os.path.exists(self.settings["snapshot_path"]):
self.settings["snapshot_path_hash"] = \
@@ -449,7 +449,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\
"/snapshots/" + self.settings["snapshot_name"] +
- self.settings["snapshot"] + ".tar.bz2")
+ self.settings["snapshot"].rstrip('/')+".tar.bz2")
if os.path.exists(self.settings["snapshot_path"]):
self.settings["snapshot_path_hash"] = \
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 55e6897..9f0733e 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -37,7 +37,7 @@ class livecd_stage2(StageBase):
file_locate(self.settings, ["cdtar","controller_file"])
def set_source_path(self):
- self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2")
+ self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2")
if os.path.isfile(self.settings["source_path"]):
self.settings["source_path_hash"] = \
self.settings["hash_map"].generate_hash(
diff --git a/catalyst/targets/stage2.py b/catalyst/targets/stage2.py
index 884b20d..e54b5c9 100644
--- a/catalyst/targets/stage2.py
+++ b/catalyst/targets/stage2.py
@@ -22,7 +22,7 @@ class stage2(StageBase):
if "seedcache" in self.settings["options"] and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")):
self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")
else:
- self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2")
+ self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2")
if os.path.isfile(self.settings["source_path"]):
if os.path.exists(self.settings["source_path"]):
# XXX: Is this even necessary if the previous check passes?
@@ -34,7 +34,7 @@ class stage2(StageBase):
print "Source path set to "+self.settings["source_path"]
if os.path.isdir(self.settings["source_path"]):
print "\tIf this is not desired, remove this directory or turn of seedcache in the options of catalyst.conf"
- print "\tthe source path will then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2\n")
+ print "\tthe source path will then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2\n")
# XXX: How do these override_foo() functions differ from the ones in
# StageBase and why aren't they in stage3_target?
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/
2015-02-26 20:44 [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/ Brian Dolbec
@ 2015-02-26 22:18 ` Brian Dolbec
0 siblings, 0 replies; 12+ messages in thread
From: Brian Dolbec @ 2015-02-26 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 7c94f3f7e2dce6860e847c841cdcfc6f3d41f3db
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 23:41:39 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 20:00:56 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7c94f3f7
Strip trailing slash from subpath's if they exist when creating filenames.
This bug was introduced in commit 52c9d37ff5de18981d6ecbe5bdde524b2bf4ebda when a trailing slash was added to target_subpath.
---
catalyst/base/stagebase.py | 10 +++++-----
catalyst/targets/livecd_stage2.py | 2 +-
catalyst/targets/stage2.py | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index eec74df..7395351 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -323,7 +323,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_target_path(self):
self.settings["target_path"]=normpath(self.settings["storedir"]+\
- "/builds/"+self.settings["target_subpath"]+".tar.bz2")
+ "/builds/"+self.settings["target_subpath"].rstrip('/')+".tar.bz2")
if "autoresume" in self.settings["options"]\
and self.resume.is_enabled("setup_target_path"):
print \
@@ -407,7 +407,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
"/tmp/" + self.settings["source_subpath"] + "/")
else:
self.settings["source_path"]=normpath(self.settings["storedir"]+\
- "/builds/"+self.settings["source_subpath"]+".tar.bz2")
+ "/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2")
if os.path.isfile(self.settings["source_path"]):
# XXX: Is this even necessary if the previous check passes?
if os.path.exists(self.settings["source_path"]):
@@ -422,7 +422,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
print "\tseedcache in the options of catalyst.conf the source path"
print "\twill then be "+\
normpath(self.settings["storedir"]+"/builds/"+\
- self.settings["source_subpath"]+".tar.bz2\n")
+ self.settings["source_subpath"].rstrip('/')+".tar.bz2\n")
def set_dest_path(self):
if "root_path" in self.settings:
@@ -438,7 +438,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_snapshot_path(self):
self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\
"/snapshots/" + self.settings["snapshot_name"] +
- self.settings["snapshot"] + ".tar.xz")
+ self.settings["snapshot"].rstrip('/')+".tar.xz")
if os.path.exists(self.settings["snapshot_path"]):
self.settings["snapshot_path_hash"] = \
@@ -449,7 +449,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\
"/snapshots/" + self.settings["snapshot_name"] +
- self.settings["snapshot"] + ".tar.bz2")
+ self.settings["snapshot"].rstrip('/')+".tar.bz2")
if os.path.exists(self.settings["snapshot_path"]):
self.settings["snapshot_path_hash"] = \
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 55e6897..9f0733e 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -37,7 +37,7 @@ class livecd_stage2(StageBase):
file_locate(self.settings, ["cdtar","controller_file"])
def set_source_path(self):
- self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2")
+ self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2")
if os.path.isfile(self.settings["source_path"]):
self.settings["source_path_hash"] = \
self.settings["hash_map"].generate_hash(
diff --git a/catalyst/targets/stage2.py b/catalyst/targets/stage2.py
index 884b20d..e54b5c9 100644
--- a/catalyst/targets/stage2.py
+++ b/catalyst/targets/stage2.py
@@ -22,7 +22,7 @@ class stage2(StageBase):
if "seedcache" in self.settings["options"] and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")):
self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")
else:
- self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2")
+ self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2")
if os.path.isfile(self.settings["source_path"]):
if os.path.exists(self.settings["source_path"]):
# XXX: Is this even necessary if the previous check passes?
@@ -34,7 +34,7 @@ class stage2(StageBase):
print "Source path set to "+self.settings["source_path"]
if os.path.isdir(self.settings["source_path"]):
print "\tIf this is not desired, remove this directory or turn of seedcache in the options of catalyst.conf"
- print "\tthe source path will then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2\n")
+ print "\tthe source path will then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2\n")
# XXX: How do these override_foo() functions differ from the ones in
# StageBase and why aren't they in stage3_target?
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/
@ 2015-10-06 13:46 Mike Frysinger
0 siblings, 0 replies; 12+ messages in thread
From: Mike Frysinger @ 2015-10-06 13:46 UTC (permalink / raw
To: gentoo-commits
commit: e10cdc703dddf4caa7990674a59ecdb0e40a8807
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 6 04:11:56 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Oct 6 04:11:56 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e10cdc70
lint: fix mixed indentation to only use tabs
catalyst/base/stagebase.py | 4 ++--
catalyst/targets/netboot2.py | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 432ad5c..a9e7848 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -24,9 +24,9 @@ from catalyst.fileops import ensure_dirs, pjoin
from catalyst.base.resume import AutoResume
if sys.version_info[0] >= 3:
- py_input = input
+ py_input = input
else:
- py_input = raw_input
+ py_input = raw_input
class StageBase(TargetBase, ClearBase, GenBase):
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py
index 5de1a74..e509cf9 100644
--- a/catalyst/targets/netboot2.py
+++ b/catalyst/targets/netboot2.py
@@ -80,10 +80,10 @@ class netboot2(StageBase):
for x in loopy:
if "netboot2/packages/"+x+"/files" in self.settings:
- if type(self.settings["netboot2/packages/"+x+"/files"]) == types.ListType:
- myfiles.extend(self.settings["netboot2/packages/"+x+"/files"])
- else:
- myfiles.append(self.settings["netboot2/packages/"+x+"/files"])
+ if type(self.settings["netboot2/packages/"+x+"/files"]) == types.ListType:
+ myfiles.extend(self.settings["netboot2/packages/"+x+"/files"])
+ else:
+ myfiles.append(self.settings["netboot2/packages/"+x+"/files"])
if "netboot2/extra_files" in self.settings:
if type(self.settings["netboot2/extra_files"]) == types.ListType:
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/
@ 2015-12-15 17:13 Brian Dolbec
0 siblings, 0 replies; 12+ messages in thread
From: Brian Dolbec @ 2015-12-15 17:13 UTC (permalink / raw
To: gentoo-commits
commit: 159c6b3919f72a41cf60b3ecbb2ce5d07b1b18f2
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 17:00:48 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 17:08:38 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=159c6b39
Split the stagebase's set_action_sequence()
Split off the configurable portions of completion sequences.
Re-use that new function in other stages.
catalyst/base/stagebase.py | 3 +++
catalyst/targets/livecd_stage1.py | 3 ++-
catalyst/targets/stage4.py | 7 +------
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 92f300e..a880249 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -506,6 +506,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
"setup_confdir","portage_overlay",\
"base_dirs","bind","chroot_setup","setup_environment",\
"run_local","preclean","unbind","clean"]
+ self.set_completion_action_sequences()
+
+ def set_completion_action_sequences(self):
if "fetch" not in self.settings["options"]:
self.settings["action_sequence"].append("capture")
if "keepwork" in self.settings["options"]:
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
index aa234b2..60ef388 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -27,7 +27,8 @@ class livecd_stage1(StageBase):
self.settings["action_sequence"]=["unpack","unpack_snapshot",\
"config_profile_link","setup_confdir","portage_overlay",\
"bind","chroot_setup","setup_environment","build_packages",\
- "unbind", "clean","clear_autoresume"]
+ "unbind", "clean"]
+ self.set_completion_action_sequences()
def set_spec_prefix(self):
self.settings["spec_prefix"]="livecd"
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 857976b..fdc8465 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -30,9 +30,4 @@ class stage4(StageBase):
"build_kernel","bootloader","root_overlay","fsscript",\
"preclean","rcupdate","unmerge","unbind","remove","empty",\
"clean"]
-
-# if "TARBALL" in self.settings or \
-# "fetch" not in self.settings['options']:
- if "fetch" not in self.settings['options']:
- self.settings["action_sequence"].append("capture")
- self.settings["action_sequence"].append("clear_autoresume")
+ self.set_completion_action_sequences()
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/
@ 2020-04-13 20:36 Matt Turner
0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2020-04-13 20:36 UTC (permalink / raw
To: gentoo-commits
commit: 56ee6814b2dade3d0c2b12ede3582a3e479aa532
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 22:23:54 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 20:35:35 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=56ee6814
catalyst: Clean assignments of {valid/required}_values
Making them class variables will allow us to verify that all subclasses
of TargetBase have defined them (in the next commit).
While we're moving them, change them to frozensets, since testing
membership is the thing they're useed for.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 68 ++++++++++++++++++++++++++-------------
catalyst/targets/embedded.py | 24 ++++++++++----
catalyst/targets/livecd_stage1.py | 11 ++++---
catalyst/targets/livecd_stage2.py | 48 +++++++++++++++++++--------
catalyst/targets/netboot.py | 29 ++++++++---------
catalyst/targets/snapshot.py | 11 +++++--
catalyst/targets/stage1.py | 10 ++++--
catalyst/targets/stage2.py | 7 ++--
catalyst/targets/stage3.py | 5 +--
catalyst/targets/stage4.py | 26 +++++++++++----
10 files changed, 159 insertions(+), 80 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 829f9fb7..a90fc843 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -27,16 +27,36 @@ class StageBase(TargetBase, ClearBase, GenBase):
the driver class for pretty much everything that Catalyst does.
"""
def __init__(self,myspec,addlargs):
- self.required_values.extend(["version_stamp", "target", "subarch",
- "rel_type", "profile", "snapshot", "source_subpath"])
-
- self.valid_values.extend(["version_stamp", "target", "subarch",
- "rel_type", "profile", "snapshot", "source_subpath",
- "portage_confdir", "portage_prefix", "portage_overlay",
- "cflags", "cxxflags", "fcflags", "fflags", "ldflags", "asflags",
- "common_flags", "cbuild", "hostuse", "catalyst_use",
- "distcc_hosts", "makeopts", "pkgcache_path", "kerncache_path",
- "compression_mode", "decompression_mode"])
+ self.required_values |= frozenset([
+ "profile",
+ "rel_type",
+ "snapshot",
+ "source_subpath",
+ "subarch",
+ "target",
+ "version_stamp",
+ ])
+ self.valid_values |= self.required_values | frozenset([
+ "asflags",
+ "catalyst_use",
+ "cbuild",
+ "cflags",
+ "common_flags",
+ "compression_mode",
+ "cxxflags",
+ "decompression_mode",
+ "distcc_hosts",
+ "fcflags",
+ "fflags",
+ "hostuse",
+ "kerncache_path",
+ "ldflags",
+ "makeopts",
+ "pkgcache_path",
+ "portage_confdir",
+ "portage_overlay",
+ "portage_prefix",
+ ])
self.set_valid_build_kernel_vars(addlargs)
TargetBase.__init__(self, myspec, addlargs)
@@ -422,7 +442,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_fsops(self):
if "fstype" in self.settings:
- self.valid_values.append("fsops")
+ self.valid_values |= {"fsops"}
if self.settings["spec_prefix"] + "/fsops" in self.settings:
self.settings["fsops"] = \
self.settings[self.settings["spec_prefix"] + "/fsops"]
@@ -647,18 +667,20 @@ class StageBase(TargetBase, ClearBase, GenBase):
loopy = addlargs["boot/kernel"]
for x in loopy:
- self.valid_values.append("boot/kernel/" + x + "/aliases")
- self.valid_values.append("boot/kernel/" + x + "/config")
- self.valid_values.append("boot/kernel/" + x + "/console")
- self.valid_values.append("boot/kernel/" + x + "/extraversion")
- self.valid_values.append("boot/kernel/" + x + "/gk_action")
- self.valid_values.append("boot/kernel/" + x + "/gk_kernargs")
- self.valid_values.append("boot/kernel/" + x + "/initramfs_overlay")
- self.valid_values.append("boot/kernel/" + x + "/sources")
- self.valid_values.append("boot/kernel/" + x + "/softlevel")
- self.valid_values.append("boot/kernel/" + x + "/use")
- self.valid_values.append("boot/kernel/" + x + "/packages")
- self.valid_values.append("boot/kernel/" + x + "/kernelopts")
+ self.valid_values |= frozenset([
+ "boot/kernel/" + x + "/aliases",
+ "boot/kernel/" + x + "/config",
+ "boot/kernel/" + x + "/console",
+ "boot/kernel/" + x + "/extraversion",
+ "boot/kernel/" + x + "/gk_action",
+ "boot/kernel/" + x + "/gk_kernargs",
+ "boot/kernel/" + x + "/initramfs_overlay",
+ "boot/kernel/" + x + "/kernelopts",
+ "boot/kernel/" + x + "/packages",
+ "boot/kernel/" + x + "/softlevel",
+ "boot/kernel/" + x + "/sources",
+ "boot/kernel/" + x + "/use",
+ ])
if "boot/kernel/" + x + "/packages" in addlargs:
if isinstance(addlargs['boot/kernel/' + x + '/packages'], str):
addlargs["boot/kernel/" + x + "/packages"] = \
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index e441757b..97604503 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -18,14 +18,24 @@ class embedded(StageBase):
"""
Builder class for embedded target
"""
- def __init__(self,spec,addlargs):
- self.required_values=[]
- self.valid_values=[]
- self.valid_values.extend(["embedded/empty","embedded/rm","embedded/unmerge","embedded/fs-prepare","embedded/fs-finish","embedded/mergeroot","embedded/packages","embedded/fs-type","embedded/runscript","boot/kernel","embedded/linuxrc"])
- self.valid_values.extend(["embedded/use"])
- if "embedded/fs-type" in addlargs:
- self.valid_values.append("embedded/fs-ops")
+ required_values = frozenset()
+ valid_values = required_values | frozenset([
+ "boot/kernel",
+ "embedded/empty",
+ "embedded/fs-finish",
+ "embedded/fs-ops",
+ "embedded/fs-prepare",
+ "embedded/fs-type",
+ "embedded/linuxrc",
+ "embedded/mergeroot",
+ "embedded/packages",
+ "embedded/rm",
+ "embedded/runscript",
+ "embedded/unmerge",
+ "embedded/use",
+ ])
+ def __init__(self,spec,addlargs):
StageBase.__init__(self,spec,addlargs)
def set_action_sequence(self):
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
index 25f54c13..fece8f79 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -12,11 +12,14 @@ class livecd_stage1(StageBase):
"""
Builder class for LiveCD stage1.
"""
- def __init__(self,spec,addlargs):
- self.required_values=["livecd/packages"]
- self.valid_values=self.required_values[:]
+ required_values = frozenset([
+ "livecd/packages",
+ ])
+ valid_values = required_values | frozenset([
+ "livecd/use",
+ ])
- self.valid_values.extend(["livecd/use"])
+ def __init__(self,spec,addlargs):
StageBase.__init__(self,spec,addlargs)
def set_action_sequence(self):
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 454dbab3..c917f9fd 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -12,21 +12,41 @@ class livecd_stage2(StageBase):
"""
Builder class for a LiveCD stage2 build.
"""
- def __init__(self,spec,addlargs):
- self.required_values=["boot/kernel"]
-
- self.valid_values=[]
-
- self.valid_values.extend(self.required_values)
- self.valid_values.extend(["livecd/cdtar","livecd/empty","livecd/rm","livecd/depclean",\
- "livecd/unmerge","livecd/iso","livecd/gk_mainargs","livecd/type",\
- "livecd/readme","livecd/motd","livecd/overlay",\
- "livecd/modblacklist","livecd/splash_theme","livecd/rcadd",\
- "livecd/rcdel","livecd/fsscript","livecd/xinitrc",\
- "livecd/root_overlay","livecd/users","portage_overlay",\
- "livecd/fstype","livecd/fsops","livecd/linuxrc","livecd/bootargs",\
- "livecd/xdm","livecd/xsession","livecd/volid","livecd/verify"])
+ required_values = frozenset([
+ "boot/kernel",
+ ])
+ valid_values = required_values | frozenset([
+ "livecd/bootargs",
+ "livecd/cdtar",
+ "livecd/depclean",
+ "livecd/empty",
+ "livecd/fsops",
+ "livecd/fsscript",
+ "livecd/fstype",
+ "livecd/gk_mainargs",
+ "livecd/iso",
+ "livecd/linuxrc",
+ "livecd/modblacklist",
+ "livecd/motd",
+ "livecd/overlay",
+ "livecd/rcadd",
+ "livecd/rcdel",
+ "livecd/readme",
+ "livecd/rm",
+ "livecd/root_overlay",
+ "livecd/splash_theme",
+ "livecd/type",
+ "livecd/unmerge",
+ "livecd/users",
+ "livecd/verify",
+ "livecd/volid",
+ "livecd/xdm",
+ "livecd/xinitrc",
+ "livecd/xsession",
+ "portage_overlay",
+ ])
+ def __init__(self,spec,addlargs):
StageBase.__init__(self,spec,addlargs)
if "livecd/type" not in self.settings:
self.settings["livecd/type"] = "generic-livecd"
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index 675a6f79..95fe3368 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -16,21 +16,20 @@ class netboot(StageBase):
"""
Builder class for a netboot build, version 2
"""
- def __init__(self,spec,addlargs):
- self.required_values=[
- "boot/kernel"
- ]
- self.valid_values=self.required_values[:]
- self.valid_values.extend([
- "netboot/packages",
- "netboot/use",
- "netboot/extra_files",
- "netboot/overlay",
- "netboot/busybox_config",
- "netboot/root_overlay",
- "netboot/linuxrc"
- ])
+ required_values = frozenset([
+ "boot/kernel",
+ ])
+ valid_values = required_values | frozenset([
+ "netboot/busybox_config",
+ "netboot/extra_files",
+ "netboot/linuxrc",
+ "netboot/overlay",
+ "netboot/packages",
+ "netboot/root_overlay",
+ "netboot/use",
+ ])
+ def __init__(self,spec,addlargs):
try:
if "netboot/packages" in addlargs:
if isinstance(addlargs['netboot/packages'], str):
@@ -39,7 +38,7 @@ class netboot(StageBase):
loopy=addlargs["netboot/packages"]
for x in loopy:
- self.valid_values.append("netboot/packages/"+x+"/files")
+ self.valid_values |= {"netboot/packages/"+x+"/files"}
except:
raise CatalystError("configuration error in netboot/packages.")
diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index b73135bc..d876acbe 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -15,10 +15,15 @@ class snapshot(TargetBase, GenBase):
"""
Builder class for snapshots.
"""
- def __init__(self,myspec,addlargs):
- self.required_values=["version_stamp","target"]
- self.valid_values=["version_stamp","target", "compression_mode"]
+ required_values = frozenset([
+ "target",
+ "version_stamp",
+ ])
+ valid_values = required_values | frozenset([
+ "compression_mode",
+ ])
+ def __init__(self,myspec,addlargs):
TargetBase.__init__(self, myspec, addlargs)
GenBase.__init__(self,myspec)
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index d40d4ffe..4ce0d0b4 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -13,10 +13,14 @@ class stage1(StageBase):
"""
Builder class for a stage1 installation tarball build.
"""
+ required_values = frozenset()
+ valid_values = required_values | frozenset([
+ "chost",
+ "update_seed",
+ "update_seed_command",
+ ])
+
def __init__(self,spec,addlargs):
- self.required_values=[]
- self.valid_values=["chost"]
- self.valid_values.extend(["update_seed","update_seed_command"])
StageBase.__init__(self,spec,addlargs)
def set_stage_path(self):
diff --git a/catalyst/targets/stage2.py b/catalyst/targets/stage2.py
index 9658a493..e975b14c 100644
--- a/catalyst/targets/stage2.py
+++ b/catalyst/targets/stage2.py
@@ -12,9 +12,12 @@ class stage2(StageBase):
"""
Builder class for a stage2 installation tarball build.
"""
+ required_values = frozenset()
+ valid_values = required_values | frozenset([
+ "chost",
+ ])
+
def __init__(self,spec,addlargs):
- self.required_values=[]
- self.valid_values=["chost"]
StageBase.__init__(self,spec,addlargs)
# XXX: How do these override_foo() functions differ from the ones in
diff --git a/catalyst/targets/stage3.py b/catalyst/targets/stage3.py
index f0831932..c8532aba 100644
--- a/catalyst/targets/stage3.py
+++ b/catalyst/targets/stage3.py
@@ -11,9 +11,10 @@ class stage3(StageBase):
"""
Builder class for a stage3 installation tarball build.
"""
+ required_values = frozenset()
+ valid_values = frozenset()
+
def __init__(self,spec,addlargs):
- self.required_values=[]
- self.valid_values=[]
StageBase.__init__(self,spec,addlargs)
def set_portage_overlay(self):
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 71c1f302..1e16ff8c 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -10,14 +10,26 @@ class stage4(StageBase):
"""
Builder class for stage4.
"""
+ required_values = frozenset([
+ "stage4/packages",
+ ])
+ valid_values = required_values | frozenset([
+ "boot/kernel",
+ "portage_overlay",
+ "splash_theme",
+ "stage4/empty",
+ "stage4/fsscript",
+ "stage4/gk_mainargs",
+ "stage4/linuxrc",
+ "stage4/rcadd",
+ "stage4/rcdel",
+ "stage4/rm",
+ "stage4/root_overlay",
+ "stage4/unmerge",
+ "stage4/use",
+ ])
+
def __init__(self,spec,addlargs):
- self.required_values=["stage4/packages"]
- self.valid_values=self.required_values[:]
- self.valid_values.extend(["stage4/use", "boot/kernel",
- "stage4/root_overlay", "stage4/fsscript",
- "stage4/gk_mainargs", "splash_theme",
- "portage_overlay", "stage4/rcadd", "stage4/rcdel",
- "stage4/linuxrc", "stage4/unmerge", "stage4/rm", "stage4/empty"])
StageBase.__init__(self,spec,addlargs)
def set_cleanables(self):
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/
@ 2020-04-22 5:52 Matt Turner
0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2020-04-22 5:52 UTC (permalink / raw
To: gentoo-commits
commit: 3b0ff52abd04aa213c844b6d716d9edbe809dc65
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 20:20:05 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 00:22:24 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3b0ff52a
catalyst: Remove code to mount /proc in stage1root
Added in commit f75bb07f3cec (Added two patches from Joshua Kinard ...),
mounting /proc in stage1root purports to fix an issue in the preclean
stage. I have no idea what that issue was, but it doesn't occur now.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 5 -----
catalyst/targets/stage1.py | 11 +----------
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 60cb891a..f8c1611e 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -213,8 +213,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.mounts.append("shm")
self.mounts.append("run")
- self.set_mounts()
-
# Configure any user specified options (either in catalyst.conf or on
# the command line).
if "pkgcache" in self.settings["options"]:
@@ -586,9 +584,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_stage_path(self):
self.settings["stage_path"] = normpath(self.settings["chroot_path"])
- def set_mounts(self):
- pass
-
def set_packages(self):
pass
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index daa0b854..93c62877 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -5,7 +5,7 @@ stage1 target
from catalyst import log
from catalyst.support import normpath
-from catalyst.fileops import ensure_dirs, move_path
+from catalyst.fileops import move_path
from catalyst.base.stagebase import StageBase
@@ -78,15 +78,6 @@ class stage1(StageBase):
"If you break it, you buy it. Don't complain to us about it.\n"
"Don't say we did not warn you.")
- def set_mounts(self):
- # stage_path/proc probably doesn't exist yet, so create it
- ensure_dirs(self.settings["stage_path"]+"/proc")
-
- # alter the mount mappings to bind mount proc onto it
- self.mounts.append("stage1root/proc")
- self.target_mounts["stage1root/proc"] = "/tmp/stage1root/proc"
- self.mountmap["stage1root/proc"] = "/proc"
-
def set_completion_action_sequences(self):
'''Override function for stage1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/
@ 2020-10-30 22:41 Matt Turner
0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2020-10-30 22:41 UTC (permalink / raw
To: gentoo-commits
commit: dfc4ed516b839bbc225cc7459e8c3085970801f6
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 00:28:24 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 22:40:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=dfc4ed51
catalyst: Move action_sequence out of self.settings[]
This self.settings[] dictionary is very similar to the god object
anti-pattern. Moving action_sequence out it starts us down the road of
fixing this.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 17 +++++++++--------
catalyst/targets/embedded.py | 2 +-
catalyst/targets/livecd_stage1.py | 2 +-
catalyst/targets/livecd_stage2.py | 6 +++---
catalyst/targets/netboot.py | 2 +-
catalyst/targets/stage1.py | 12 ++++++------
catalyst/targets/stage4.py | 2 +-
7 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 73eacfbe..801df2fb 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -64,6 +64,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
"portage_overlay",
"portage_prefix",
])
+ self.action_sequence = []
self.set_valid_build_kernel_vars(addlargs)
TargetBase.__init__(self, myspec, addlargs)
@@ -477,13 +478,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
Or it calls the normal set_action_sequence() for the target stage.
"""
if "purgeonly" in self.settings["options"]:
- self.settings["action_sequence"] = ["remove_chroot"]
+ self.action_sequence = ["remove_chroot"]
return
self.set_action_sequence()
def set_action_sequence(self):
"""Set basic stage1, 2, 3 action sequences"""
- self.settings['action_sequence'] = [
+ self.action_sequence = [
"unpack",
"setup_confdir",
"portage_overlay",
@@ -499,14 +500,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_completion_action_sequences(self):
if "fetch" not in self.settings["options"]:
- self.settings["action_sequence"].append("capture")
+ self.action_sequence.append("capture")
if "keepwork" in self.settings["options"]:
- self.settings["action_sequence"].append("clear_autoresume")
+ self.action_sequence.append("clear_autoresume")
elif "seedcache" in self.settings["options"]:
- self.settings["action_sequence"].append("remove_autoresume")
+ self.action_sequence.append("remove_autoresume")
else:
- self.settings["action_sequence"].append("remove_autoresume")
- self.settings["action_sequence"].append("remove_chroot")
+ self.action_sequence.append("remove_autoresume")
+ self.action_sequence.append("remove_chroot")
def set_use(self):
use = self.settings["spec_prefix"] + "/use"
@@ -1380,7 +1381,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.purge()
failure = False
- for x in self.settings["action_sequence"]:
+ for x in self.action_sequence:
log.notice('--- Running action sequence: %s', x)
sys.stdout.flush()
try:
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 99739512..3899cf1b 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -41,7 +41,7 @@ class embedded(StageBase):
StageBase.__init__(self, spec, addlargs)
def set_action_sequence(self):
- self.settings['action_sequence'] = [
+ self.action_sequence = [
"unpack",
"config_profile_link",
"setup_confdir",
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
index f0b6be8b..b8c26cb1 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -23,7 +23,7 @@ class livecd_stage1(StageBase):
StageBase.__init__(self, spec, addlargs)
def set_action_sequence(self):
- self.settings['action_sequence'] = [
+ self.action_sequence = [
"unpack",
"config_profile_link",
"setup_confdir",
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 88c0d95c..cac16b6e 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -87,7 +87,7 @@ class livecd_stage2(StageBase):
print_traceback=True)
def set_action_sequence(self):
- self.settings['action_sequence'] = [
+ self.action_sequence = [
"unpack",
"config_profile_link",
"setup_confdir",
@@ -99,7 +99,7 @@ class livecd_stage2(StageBase):
"build_kernel"
]
if "fetch" not in self.settings["options"]:
- self.settings['action_sequence'] += [
+ self.action_sequence += [
"bootloader",
"preclean",
"livecd_update",
@@ -115,4 +115,4 @@ class livecd_stage2(StageBase):
"setup_overlay",
"create_iso",
]
- self.settings["action_sequence"].append("clear_autoresume")
+ self.action_sequence.append("clear_autoresume")
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index 5620e0d3..61583f0d 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -160,7 +160,7 @@ class netboot(StageBase):
self.resume.enable("empty")
def set_action_sequence(self):
- self.settings['action_sequence'] = [
+ self.action_sequence = [
"unpack",
"config_profile_link",
"setup_confdir",
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index 2c09a41f..89b30fe1 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -87,15 +87,15 @@ class stage1(StageBase):
chroot for re-use in stage2 without the need to unpack it.
'''
if "fetch" not in self.settings["options"]:
- self.settings["action_sequence"].append("capture")
+ self.action_sequence.append("capture")
if "keepwork" in self.settings["options"]:
- self.settings["action_sequence"].append("clear_autoresume")
+ self.action_sequence.append("clear_autoresume")
elif "seedcache" in self.settings["options"]:
- self.settings["action_sequence"].append("remove_autoresume")
- self.settings["action_sequence"].append("clean_stage1")
+ self.action_sequence.append("remove_autoresume")
+ self.action_sequence.append("clean_stage1")
else:
- self.settings["action_sequence"].append("remove_autoresume")
- self.settings["action_sequence"].append("remove_chroot")
+ self.action_sequence.append("remove_autoresume")
+ self.action_sequence.append("remove_chroot")
def clean_stage1(self):
'''seedcache is enabled, so salvage the /tmp/stage1root,
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 346c0845..eef24a73 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -39,7 +39,7 @@ class stage4(StageBase):
self.settings["cleanables"].remove('/etc/resolv.conf')
def set_action_sequence(self):
- self.settings['action_sequence'] = [
+ self.action_sequence = [
"unpack",
"config_profile_link",
"setup_confdir",
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/
@ 2020-10-30 22:41 Matt Turner
0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2020-10-30 22:41 UTC (permalink / raw
To: gentoo-commits
commit: 4b5ff905a7ad2ffe1ed8c863b91e9d0ce6981f5f
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 20:37:54 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 22:40:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4b5ff905
catalyst: Drop unbind()
mount_namespaces(7) says
A mount ceases to be a member of a peer group when either the
mount is explicitly unmounted, or when the mount is implicitly
unmounted because a mount namespace is removed (because it has
no more member processes).
As a result, we can rely on exiting the mount namespace to unmount the
bind mounts.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 44 +--------------------------------------
catalyst/targets/embedded.py | 1 -
catalyst/targets/livecd_stage1.py | 1 -
catalyst/targets/livecd_stage2.py | 2 --
catalyst/targets/netboot.py | 3 ---
catalyst/targets/stage4.py | 1 -
6 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index b9c220d0..a75dbdf9 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -498,7 +498,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
"setup_environment",
"run_local",
"preclean",
- "unbind",
])
self.finish_sequence.extend([
"clean",
@@ -853,40 +852,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
fstype=fstype, options=options)
cxt.mount()
except OSError as e:
- self.unbind()
raise CatalystError(f"Couldn't mount: {source}, {e.strerror}")
- def unbind(self):
- chroot_path = self.settings["chroot_path"]
- umount_failed = False
-
- # Unmount in reverse order
- for target in [Path(chroot_path + self.mount[x]['target'])
- for x in reversed(self.mount)
- if self.mount[x]['enable']]:
- if not target.exists():
- log.debug('%s does not exist. Skipping', target)
- continue
-
- if not ismount(target):
- log.debug('%s is not a mount point. Skipping', target)
- continue
-
- try:
- cxt = libmount.Context(target=str(target))
- cxt.umount()
- except OSError as e:
- log.warning("Couldn't umount: %s, %s", target,
- e.strerror)
- umount_failed = True
-
- if umount_failed:
- # if any bind mounts really failed, then we need to raise
- # this to potentially prevent an upcoming bash stage cleanup script
- # from wiping our bind mounts.
- raise CatalystError(
- "Couldn't umount one or more bind-mounts; aborting for safety.")
-
def chroot_setup(self):
self.makeconf = read_makeconf(normpath(self.settings["chroot_path"] +
self.settings["make_conf"]))
@@ -1190,7 +1157,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
env=self.env)
self.resume.enable("remove")
except:
- self.unbind()
raise
def preclean(self):
@@ -1206,7 +1172,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.resume.enable("preclean")
except:
- self.unbind()
raise CatalystError("Build failed, could not execute preclean")
def capture(self):
@@ -1269,7 +1234,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings['controller_file'])
except CatalystError:
- self.unbind()
raise CatalystError("Stage build aborting due to error.",
print_traceback=False)
@@ -1374,7 +1338,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
env=self.env)
log.info('unmerge shell script')
except CatalystError:
- self.unbind()
raise
self.resume.enable("unmerge")
@@ -1449,7 +1412,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
fileutils.touch(build_packages_resume)
self.resume.enable("build_packages")
except CatalystError:
- self.unbind()
raise CatalystError(
self.settings["spec_prefix"] +
"build aborting due to error.")
@@ -1473,7 +1435,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
self._build_kernel(kname=kname)
self.resume.enable("build_kernel")
except CatalystError:
- self.unbind()
raise CatalystError(
"build aborting due to kernel build error.",
print_traceback=True)
@@ -1517,7 +1478,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
key = 'boot/kernel/' + kname + '/config'
if key in self.settings:
if not os.path.exists(self.settings[key]):
- self.unbind()
raise CatalystError("Can't find kernel config: %s" %
self.settings[key])
@@ -1526,7 +1486,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings['chroot_path'] + '/var/tmp/' + kname + '.config')
except IOError:
- self.unbind()
+ raise
def _copy_initramfs_overlay(self, kname):
key = 'boot/kernel/' + kname + '/initramfs_overlay'
@@ -1556,7 +1516,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
env=self.env)
self.resume.enable("bootloader")
except CatalystError:
- self.unbind()
raise CatalystError("Script aborting due to error.")
def livecd_update(self):
@@ -1572,7 +1531,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.resume.enable("livecd_update")
except CatalystError:
- self.unbind()
raise CatalystError(
"build aborting due to livecd_update error.")
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 1314ce7c..e9138437 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -56,7 +56,6 @@ class embedded(StageBase):
"root_overlay",
"fsscript",
"unmerge",
- "unbind",
])
self.finish_sequence.extend([
"remove",
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
index 81367053..5c5e9f58 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -34,7 +34,6 @@ class livecd_stage1(StageBase):
"chroot_setup",
"setup_environment",
"build_packages",
- "unbind",
])
self.finish_sequence.extend([
"clean",
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index f6c14919..3606047f 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -80,7 +80,6 @@ class livecd_stage2(StageBase):
for x in self.settings["livecd/modblacklist"]:
myf.write("\nblacklist "+x)
except:
- self.unbind()
raise CatalystError("Couldn't open " +
self.settings["chroot_path"] +
"/etc/modprobe.d/blacklist.conf.",
@@ -109,7 +108,6 @@ class livecd_stage2(StageBase):
"fsscript",
"rcupdate",
"unmerge",
- "unbind",
])
self.finish_sequence.extend([
"remove",
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index 9a0a4156..55f4dff1 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -93,7 +93,6 @@ class netboot(StageBase):
cmd([self.settings['controller_file'], 'image'] +
myfiles, env=self.env)
except CatalystError:
- self.unbind()
raise CatalystError("Failed to copy files to image!",
print_traceback=True)
@@ -121,7 +120,6 @@ class netboot(StageBase):
cmd([self.settings['controller_file'], 'final'], env=self.env)
log.notice('Netboot Build Finished!')
except CatalystError:
- self.unbind()
raise CatalystError("Failed to move kernel images!",
print_traceback=True)
@@ -178,7 +176,6 @@ class netboot(StageBase):
"move_kernels",
"remove",
"empty",
- "unbind",
])
self.finish_sequence.extend([
"clean",
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 78a5c780..b7f74b01 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -57,7 +57,6 @@ class stage4(StageBase):
"preclean",
"rcupdate",
"unmerge",
- "unbind",
])
self.finish_sequence.extend([
"remove",
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/base/, catalyst/targets/
@ 2021-01-28 1:54 Matt Turner
2021-01-23 16:22 ` [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/ Matt Turner
0 siblings, 1 reply; 12+ messages in thread
From: Matt Turner @ 2021-01-28 1:54 UTC (permalink / raw
To: gentoo-commits
commit: 440a379ae94e6d7df26291bf83657288d1406e98
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 23:53:21 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 16:19:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=440a379a
catalyst: Store references to functions
... rather than their names. This makes it possible for tooling to
understand the code structure better.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 69 ++++++++++++++++++++-------------------
catalyst/targets/embedded.py | 34 +++++++++----------
catalyst/targets/livecd_stage1.py | 18 +++++-----
catalyst/targets/livecd_stage2.py | 46 +++++++++++++-------------
catalyst/targets/netboot.py | 34 +++++++++----------
catalyst/targets/stage1.py | 12 +++----
catalyst/targets/stage4.py | 36 ++++++++++----------
7 files changed, 125 insertions(+), 124 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index ed4d1227..447e073d 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -30,6 +30,23 @@ from catalyst.fileops import ensure_dirs, clear_dir, clear_path
from catalyst.base.resume import AutoResume
+def run_sequence(sequence):
+ for func in sequence:
+ log.notice('--- Running action sequence: %s', func.__name__)
+ sys.stdout.flush()
+ try:
+ func()
+ except LockInUse:
+ log.error('Unable to aquire the lock...')
+ return False
+ except Exception:
+ log.error('Exception running action sequence %s',
+ func.__name__, exc_info=True)
+ return False
+
+ return True
+
+
class StageBase(TargetBase, ClearBase, GenBase):
"""
This class does all of the chroot setup, copying of files, etc. It is
@@ -475,39 +492,39 @@ class StageBase(TargetBase, ClearBase, GenBase):
Or it calls the normal set_action_sequence() for the target stage.
"""
if "purgeonly" in self.settings["options"]:
- self.build_sequence.append("remove_chroot")
+ self.build_sequence.append(self.remove_chroot)
return
self.set_action_sequence()
def set_action_sequence(self):
"""Set basic stage1, 2, 3 action sequences"""
self.prepare_sequence.extend([
- "unpack",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "run_local",
- "preclean",
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.run_local,
+ self.preclean,
])
self.finish_sequence.extend([
- "clean",
+ self.clean,
])
self.set_completion_action_sequences()
def set_completion_action_sequences(self):
if "fetch" not in self.settings["options"]:
- self.finish_sequence.append("capture")
+ self.finish_sequence.append(self.capture)
if "keepwork" in self.settings["options"]:
- self.finish_sequence.append("clear_autoresume")
+ self.finish_sequence.append(self.clear_autoresume)
elif "seedcache" in self.settings["options"]:
- self.finish_sequence.append("remove_autoresume")
+ self.finish_sequence.append(self.remove_autoresume)
else:
- self.finish_sequence.append("remove_autoresume")
- self.finish_sequence.append("remove_chroot")
+ self.finish_sequence.append(self.remove_autoresume)
+ self.finish_sequence.append(self.remove_chroot)
def set_use(self):
use = self.settings["spec_prefix"] + "/use"
@@ -1308,22 +1325,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
log.debug('setup_environment(); env = %r', self.env)
- def run_sequence(self, sequence):
- for func in sequence:
- log.notice('--- Running action sequence: %s', func)
- sys.stdout.flush()
- try:
- getattr(self, func)()
- except LockInUse:
- log.error('Unable to aquire the lock...')
- return False
- except Exception:
- log.error('Exception running action sequence %s',
- func, exc_info=True)
- return False
-
- return True
-
def run(self):
self.chroot_lock.write_lock()
@@ -1342,14 +1343,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
log.info('StageBase: run() purge')
self.purge()
- if not self.run_sequence(self.prepare_sequence):
+ if not run_sequence(self.prepare_sequence):
return False
with namespace(mount=True):
- if not self.run_sequence(self.build_sequence):
+ if not run_sequence(self.build_sequence):
return False
- if not self.run_sequence(self.finish_sequence):
+ if not run_sequence(self.finish_sequence):
return False
return True
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 918b36bf..7d328808 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -42,27 +42,27 @@ class embedded(StageBase):
def set_action_sequence(self):
self.prepare_sequence.extend([
- "unpack",
- "config_profile_link",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.config_profile_link,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "build_kernel",
- "build_packages",
- "root_overlay",
- "fsscript",
- "unmerge",
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.build_kernel,
+ self.build_packages,
+ self.root_overlay,
+ self.fsscript,
+ self.unmerge,
])
self.finish_sequence.extend([
- "remove",
- "empty",
- "clean",
- "capture",
- "clear_autoresume",
+ self.remove,
+ self.empty,
+ self.clean,
+ self.capture,
+ self.clear_autoresume,
])
def set_root_path(self):
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
index 5c5e9f58..eb6bb0f0 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -24,19 +24,19 @@ class livecd_stage1(StageBase):
def set_action_sequence(self):
self.prepare_sequence.extend([
- "unpack",
- "config_profile_link",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.config_profile_link,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "build_packages",
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.build_packages,
])
self.finish_sequence.extend([
- "clean",
+ self.clean,
])
self.set_completion_action_sequences()
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 3606047f..5fecff85 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -87,34 +87,34 @@ class livecd_stage2(StageBase):
def set_action_sequence(self):
self.prepare_sequence.extend([
- "unpack",
- "config_profile_link",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.config_profile_link,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "run_local",
- "build_kernel"
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.run_local,
+ self.build_kernel
])
if "fetch" not in self.settings["options"]:
self.build_sequence.extend([
- "bootloader",
- "preclean",
- "livecd_update",
- "root_overlay",
- "fsscript",
- "rcupdate",
- "unmerge",
+ self.bootloader,
+ self.preclean,
+ self.livecd_update,
+ self.root_overlay,
+ self.fsscript,
+ self.rcupdate,
+ self.unmerge,
])
self.finish_sequence.extend([
- "remove",
- "empty",
- "clean",
- "target_setup",
- "setup_overlay",
- "create_iso",
+ self.remove,
+ self.empty,
+ self.clean,
+ self.target_setup,
+ self.setup_overlay,
+ self.create_iso,
])
- self.finish_sequence.append("clear_autoresume")
+ self.finish_sequence.append(self.clear_autoresume)
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index 55f4dff1..9a7e59e5 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -159,25 +159,25 @@ class netboot(StageBase):
def set_action_sequence(self):
self.prepare_sequence.extend([
- "unpack",
- "config_profile_link",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.config_profile_link,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "build_packages",
- "root_overlay",
- "copy_files_to_image",
- "setup_overlay",
- "build_kernel",
- "move_kernels",
- "remove",
- "empty",
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.build_packages,
+ self.root_overlay,
+ self.copy_files_to_image,
+ self.setup_overlay,
+ self.build_kernel,
+ self.move_kernels,
+ self.remove,
+ self.empty,
])
self.finish_sequence.extend([
- "clean",
- "clear_autoresume",
+ self.clean,
+ self.clear_autoresume,
])
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index 5aa27bb9..5a154e76 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -82,15 +82,15 @@ class stage1(StageBase):
chroot for re-use in stage2 without the need to unpack it.
'''
if "fetch" not in self.settings["options"]:
- self.finish_sequence.append("capture")
+ self.finish_sequence.append(self.capture)
if "keepwork" in self.settings["options"]:
- self.finish_sequence.append("clear_autoresume")
+ self.finish_sequence.append(self.clear_autoresume)
elif "seedcache" in self.settings["options"]:
- self.finish_sequence.append("remove_autoresume")
- self.finish_sequence.append("clean_stage1")
+ self.finish_sequence.append(self.remove_autoresume)
+ self.finish_sequence.append(self.clean_stage1)
else:
- self.finish_sequence.append("remove_autoresume")
- self.finish_sequence.append("remove_chroot")
+ self.finish_sequence.append(self.remove_autoresume)
+ self.finish_sequence.append(self.remove_chroot)
def clean_stage1(self):
'''seedcache is enabled, so salvage the /tmp/stage1root,
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index b7f74b01..997139a5 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -40,27 +40,27 @@ class stage4(StageBase):
def set_action_sequence(self):
self.prepare_sequence.extend([
- "unpack",
- "config_profile_link",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.config_profile_link,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "build_packages",
- "build_kernel",
- "bootloader",
- "root_overlay",
- "fsscript",
- "preclean",
- "rcupdate",
- "unmerge",
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.build_packages,
+ self.build_kernel,
+ self.bootloader,
+ self.root_overlay,
+ self.fsscript,
+ self.preclean,
+ self.rcupdate,
+ self.unmerge,
])
self.finish_sequence.extend([
- "remove",
- "empty",
- "clean",
+ self.remove,
+ self.empty,
+ self.clean,
])
self.set_completion_action_sequences()
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/
2021-01-28 1:54 [gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/base/, catalyst/targets/ Matt Turner
@ 2021-01-23 16:22 ` Matt Turner
0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2021-01-23 16:22 UTC (permalink / raw
To: gentoo-commits
commit: 440a379ae94e6d7df26291bf83657288d1406e98
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 23:53:21 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 16:19:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=440a379a
catalyst: Store references to functions
... rather than their names. This makes it possible for tooling to
understand the code structure better.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 69 ++++++++++++++++++++-------------------
catalyst/targets/embedded.py | 34 +++++++++----------
catalyst/targets/livecd_stage1.py | 18 +++++-----
catalyst/targets/livecd_stage2.py | 46 +++++++++++++-------------
catalyst/targets/netboot.py | 34 +++++++++----------
catalyst/targets/stage1.py | 12 +++----
catalyst/targets/stage4.py | 36 ++++++++++----------
7 files changed, 125 insertions(+), 124 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index ed4d1227..447e073d 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -30,6 +30,23 @@ from catalyst.fileops import ensure_dirs, clear_dir, clear_path
from catalyst.base.resume import AutoResume
+def run_sequence(sequence):
+ for func in sequence:
+ log.notice('--- Running action sequence: %s', func.__name__)
+ sys.stdout.flush()
+ try:
+ func()
+ except LockInUse:
+ log.error('Unable to aquire the lock...')
+ return False
+ except Exception:
+ log.error('Exception running action sequence %s',
+ func.__name__, exc_info=True)
+ return False
+
+ return True
+
+
class StageBase(TargetBase, ClearBase, GenBase):
"""
This class does all of the chroot setup, copying of files, etc. It is
@@ -475,39 +492,39 @@ class StageBase(TargetBase, ClearBase, GenBase):
Or it calls the normal set_action_sequence() for the target stage.
"""
if "purgeonly" in self.settings["options"]:
- self.build_sequence.append("remove_chroot")
+ self.build_sequence.append(self.remove_chroot)
return
self.set_action_sequence()
def set_action_sequence(self):
"""Set basic stage1, 2, 3 action sequences"""
self.prepare_sequence.extend([
- "unpack",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "run_local",
- "preclean",
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.run_local,
+ self.preclean,
])
self.finish_sequence.extend([
- "clean",
+ self.clean,
])
self.set_completion_action_sequences()
def set_completion_action_sequences(self):
if "fetch" not in self.settings["options"]:
- self.finish_sequence.append("capture")
+ self.finish_sequence.append(self.capture)
if "keepwork" in self.settings["options"]:
- self.finish_sequence.append("clear_autoresume")
+ self.finish_sequence.append(self.clear_autoresume)
elif "seedcache" in self.settings["options"]:
- self.finish_sequence.append("remove_autoresume")
+ self.finish_sequence.append(self.remove_autoresume)
else:
- self.finish_sequence.append("remove_autoresume")
- self.finish_sequence.append("remove_chroot")
+ self.finish_sequence.append(self.remove_autoresume)
+ self.finish_sequence.append(self.remove_chroot)
def set_use(self):
use = self.settings["spec_prefix"] + "/use"
@@ -1308,22 +1325,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
log.debug('setup_environment(); env = %r', self.env)
- def run_sequence(self, sequence):
- for func in sequence:
- log.notice('--- Running action sequence: %s', func)
- sys.stdout.flush()
- try:
- getattr(self, func)()
- except LockInUse:
- log.error('Unable to aquire the lock...')
- return False
- except Exception:
- log.error('Exception running action sequence %s',
- func, exc_info=True)
- return False
-
- return True
-
def run(self):
self.chroot_lock.write_lock()
@@ -1342,14 +1343,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
log.info('StageBase: run() purge')
self.purge()
- if not self.run_sequence(self.prepare_sequence):
+ if not run_sequence(self.prepare_sequence):
return False
with namespace(mount=True):
- if not self.run_sequence(self.build_sequence):
+ if not run_sequence(self.build_sequence):
return False
- if not self.run_sequence(self.finish_sequence):
+ if not run_sequence(self.finish_sequence):
return False
return True
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 918b36bf..7d328808 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -42,27 +42,27 @@ class embedded(StageBase):
def set_action_sequence(self):
self.prepare_sequence.extend([
- "unpack",
- "config_profile_link",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.config_profile_link,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "build_kernel",
- "build_packages",
- "root_overlay",
- "fsscript",
- "unmerge",
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.build_kernel,
+ self.build_packages,
+ self.root_overlay,
+ self.fsscript,
+ self.unmerge,
])
self.finish_sequence.extend([
- "remove",
- "empty",
- "clean",
- "capture",
- "clear_autoresume",
+ self.remove,
+ self.empty,
+ self.clean,
+ self.capture,
+ self.clear_autoresume,
])
def set_root_path(self):
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
index 5c5e9f58..eb6bb0f0 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -24,19 +24,19 @@ class livecd_stage1(StageBase):
def set_action_sequence(self):
self.prepare_sequence.extend([
- "unpack",
- "config_profile_link",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.config_profile_link,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "build_packages",
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.build_packages,
])
self.finish_sequence.extend([
- "clean",
+ self.clean,
])
self.set_completion_action_sequences()
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 3606047f..5fecff85 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -87,34 +87,34 @@ class livecd_stage2(StageBase):
def set_action_sequence(self):
self.prepare_sequence.extend([
- "unpack",
- "config_profile_link",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.config_profile_link,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "run_local",
- "build_kernel"
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.run_local,
+ self.build_kernel
])
if "fetch" not in self.settings["options"]:
self.build_sequence.extend([
- "bootloader",
- "preclean",
- "livecd_update",
- "root_overlay",
- "fsscript",
- "rcupdate",
- "unmerge",
+ self.bootloader,
+ self.preclean,
+ self.livecd_update,
+ self.root_overlay,
+ self.fsscript,
+ self.rcupdate,
+ self.unmerge,
])
self.finish_sequence.extend([
- "remove",
- "empty",
- "clean",
- "target_setup",
- "setup_overlay",
- "create_iso",
+ self.remove,
+ self.empty,
+ self.clean,
+ self.target_setup,
+ self.setup_overlay,
+ self.create_iso,
])
- self.finish_sequence.append("clear_autoresume")
+ self.finish_sequence.append(self.clear_autoresume)
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index 55f4dff1..9a7e59e5 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -159,25 +159,25 @@ class netboot(StageBase):
def set_action_sequence(self):
self.prepare_sequence.extend([
- "unpack",
- "config_profile_link",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.config_profile_link,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "build_packages",
- "root_overlay",
- "copy_files_to_image",
- "setup_overlay",
- "build_kernel",
- "move_kernels",
- "remove",
- "empty",
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.build_packages,
+ self.root_overlay,
+ self.copy_files_to_image,
+ self.setup_overlay,
+ self.build_kernel,
+ self.move_kernels,
+ self.remove,
+ self.empty,
])
self.finish_sequence.extend([
- "clean",
- "clear_autoresume",
+ self.clean,
+ self.clear_autoresume,
])
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index 5aa27bb9..5a154e76 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -82,15 +82,15 @@ class stage1(StageBase):
chroot for re-use in stage2 without the need to unpack it.
'''
if "fetch" not in self.settings["options"]:
- self.finish_sequence.append("capture")
+ self.finish_sequence.append(self.capture)
if "keepwork" in self.settings["options"]:
- self.finish_sequence.append("clear_autoresume")
+ self.finish_sequence.append(self.clear_autoresume)
elif "seedcache" in self.settings["options"]:
- self.finish_sequence.append("remove_autoresume")
- self.finish_sequence.append("clean_stage1")
+ self.finish_sequence.append(self.remove_autoresume)
+ self.finish_sequence.append(self.clean_stage1)
else:
- self.finish_sequence.append("remove_autoresume")
- self.finish_sequence.append("remove_chroot")
+ self.finish_sequence.append(self.remove_autoresume)
+ self.finish_sequence.append(self.remove_chroot)
def clean_stage1(self):
'''seedcache is enabled, so salvage the /tmp/stage1root,
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index b7f74b01..997139a5 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -40,27 +40,27 @@ class stage4(StageBase):
def set_action_sequence(self):
self.prepare_sequence.extend([
- "unpack",
- "config_profile_link",
- "setup_confdir",
- "portage_overlay",
+ self.unpack,
+ self.config_profile_link,
+ self.setup_confdir,
+ self.portage_overlay,
])
self.build_sequence.extend([
- "bind",
- "chroot_setup",
- "setup_environment",
- "build_packages",
- "build_kernel",
- "bootloader",
- "root_overlay",
- "fsscript",
- "preclean",
- "rcupdate",
- "unmerge",
+ self.bind,
+ self.chroot_setup,
+ self.setup_environment,
+ self.build_packages,
+ self.build_kernel,
+ self.bootloader,
+ self.root_overlay,
+ self.fsscript,
+ self.preclean,
+ self.rcupdate,
+ self.unmerge,
])
self.finish_sequence.extend([
- "remove",
- "empty",
- "clean",
+ self.remove,
+ self.empty,
+ self.clean,
])
self.set_completion_action_sequences()
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-01-23 16:23 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-26 19:25 [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/ Brian Dolbec
2015-02-26 20:12 ` [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/ Brian Dolbec
-- strict thread matches above, loose matches on Subject: below --
2015-02-26 19:25 [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/ Brian Dolbec
2015-02-26 20:12 ` [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/ Brian Dolbec
2015-02-26 20:44 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-02-26 22:18 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-02-26 20:44 [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/ Brian Dolbec
2015-02-26 22:18 ` [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/ Brian Dolbec
2015-10-06 13:46 Mike Frysinger
2015-12-15 17:13 Brian Dolbec
2020-04-13 20:36 Matt Turner
2020-04-22 5:52 Matt Turner
2020-10-30 22:41 Matt Turner
2020-10-30 22:41 Matt Turner
2021-01-28 1:54 [gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/base/, catalyst/targets/ Matt Turner
2021-01-23 16:22 ` [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/ Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox