* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2015-05-24 0:08 Brian Dolbec
2015-05-21 23:53 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2015-05-24 0:08 UTC (permalink / raw
To: gentoo-commits
commit: f2afd7ff03e6e8453e86be938bd21c2cd33d3996
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 4 01:56:56 2014 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 23:04:28 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f2afd7ff
Fix purgeonly to remove the chroot directory.
catalyst/base/stagebase.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index f2aadee..191baab 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -504,6 +504,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_action_sequence(self):
""" Default action sequence for run method """
+ if "purgeonly" in self.settings["options"]:
+ self.settings["action_sequence"] = ["remove_chroot"]
+ return
self.settings["action_sequence"]=["unpack","unpack_snapshot",\
"setup_confdir","portage_overlay",\
"base_dirs","bind","chroot_setup","setup_environment",\
@@ -517,6 +520,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
self.settings["action_sequence"].append("remove_autoresume")
self.settings["action_sequence"].append("remove_chroot")
+ return
def set_use(self):
if self.settings["spec_prefix"]+"/use" in self.settings:
@@ -1321,11 +1325,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.purge()
return
- if "PURGEONLY" in self.settings:
+ if "purgeonly" in self.settings["options"]:
+ print "StageBase: run() purgeonly"
self.purge()
- return
if "purge" in self.settings["options"]:
+ print "StageBase: run() purge"
self.purge()
for x in self.settings["action_sequence"]:
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
2015-05-24 0:08 [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ Brian Dolbec
@ 2015-05-21 23:53 ` Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-05-21 23:53 UTC (permalink / raw
To: gentoo-commits
commit: f2afd7ff03e6e8453e86be938bd21c2cd33d3996
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 4 01:56:56 2014 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 23:04:28 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f2afd7ff
Fix purgeonly to remove the chroot directory.
catalyst/base/stagebase.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index f2aadee..191baab 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -504,6 +504,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_action_sequence(self):
""" Default action sequence for run method """
+ if "purgeonly" in self.settings["options"]:
+ self.settings["action_sequence"] = ["remove_chroot"]
+ return
self.settings["action_sequence"]=["unpack","unpack_snapshot",\
"setup_confdir","portage_overlay",\
"base_dirs","bind","chroot_setup","setup_environment",\
@@ -517,6 +520,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
self.settings["action_sequence"].append("remove_autoresume")
self.settings["action_sequence"].append("remove_chroot")
+ return
def set_use(self):
if self.settings["spec_prefix"]+"/use" in self.settings:
@@ -1321,11 +1325,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.purge()
return
- if "PURGEONLY" in self.settings:
+ if "purgeonly" in self.settings["options"]:
+ print "StageBase: run() purgeonly"
self.purge()
- return
if "purge" in self.settings["options"]:
+ print "StageBase: run() purge"
self.purge()
for x in self.settings["action_sequence"]:
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2017-11-29 17:20 Brian Dolbec
2017-11-22 15:52 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2017-11-29 17:20 UTC (permalink / raw
To: gentoo-commits
commit: 40c83b1e77efc539ca80709ae3ae0a56b065a7d1
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 08:25:15 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 01:16:21 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=40c83b1e
base/stagebase.py: Update the cleanables to the new repo variables
catalyst/base/stagebase.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 67382b9a..d44db985 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -452,7 +452,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_cleanables(self):
self.settings["cleanables"] = ["/etc/resolv.conf", "/var/tmp/*", "/tmp/*",
- "/root/*", self.settings["portdir"]]
+ "/root/*", self.settings["repo_basedir"] + "/" +
+ self.settings["repo_name"]]
def set_snapshot_path(self):
self.settings["snapshot_path"] = file_check(
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
2017-11-29 17:20 [gentoo-commits] proj/catalyst:master " Brian Dolbec
@ 2017-11-22 15:52 ` Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-11-22 15:52 UTC (permalink / raw
To: gentoo-commits
commit: 40c83b1e77efc539ca80709ae3ae0a56b065a7d1
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 08:25:15 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 01:16:21 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=40c83b1e
base/stagebase.py: Update the cleanables to the new repo variables
catalyst/base/stagebase.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 67382b9a..d44db985 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -452,7 +452,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_cleanables(self):
self.settings["cleanables"] = ["/etc/resolv.conf", "/var/tmp/*", "/tmp/*",
- "/root/*", self.settings["portdir"]]
+ "/root/*", self.settings["repo_basedir"] + "/" +
+ self.settings["repo_name"]]
def set_snapshot_path(self):
self.settings["snapshot_path"] = file_check(
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2017-11-29 17:20 Brian Dolbec
2017-11-22 15:52 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2017-11-29 17:20 UTC (permalink / raw
To: gentoo-commits
commit: 739a1a78513a27b5234fce708acb64211c43cb74
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 08:58:10 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 01:16:20 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=739a1a78
base/stagebase.py: Correctly log the correct function name for unpack_snapshot()
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 93c13902..532f0997 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -822,7 +822,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_portdir = normpath(self.settings["chroot_path"] +
self.settings["repo_basedir"] + "/" + self.settings["repo_name"])
log.info('%s', self.settings['chroot_path'])
- log.info('unpack(), target_portdir = %s', target_portdir)
+ log.info('unpack_snapshot(), target_portdir = %s', target_portdir)
if "snapcache" in self.settings["options"]:
snapshot_cache_hash_path = pjoin(
self.settings['snapshot_cache_path'], 'catalyst-hash')
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
2017-11-29 17:20 [gentoo-commits] proj/catalyst:master " Brian Dolbec
@ 2017-11-22 15:52 ` Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-11-22 15:52 UTC (permalink / raw
To: gentoo-commits
commit: 739a1a78513a27b5234fce708acb64211c43cb74
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 08:58:10 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 01:16:20 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=739a1a78
base/stagebase.py: Correctly log the correct function name for unpack_snapshot()
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 93c13902..532f0997 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -822,7 +822,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_portdir = normpath(self.settings["chroot_path"] +
self.settings["repo_basedir"] + "/" + self.settings["repo_name"])
log.info('%s', self.settings['chroot_path'])
- log.info('unpack(), target_portdir = %s', target_portdir)
+ log.info('unpack_snapshot(), target_portdir = %s', target_portdir)
if "snapcache" in self.settings["options"]:
snapshot_cache_hash_path = pjoin(
self.settings['snapshot_cache_path'], 'catalyst-hash')
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2017-11-22 15:52 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-11-22 15:52 UTC (permalink / raw
To: gentoo-commits
commit: 03d8e9d832dcf2b3e52f4aa84e0782e47f3c9b71
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 08:56:45 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 01:16:20 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=03d8e9d8
base/stagebase.py: Rename unpack_portage resume point to unpack_repo
One part of the effort to separate the portage name from the repository.
catalyst/base/stagebase.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index b857a64b..93c13902 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -808,7 +808,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def unpack_snapshot(self):
unpack = True
- snapshot_hash = self.resume.get("unpack_portage")
+ snapshot_hash = self.resume.get("unpack_repo")
unpack_errmsg = "Error unpacking snapshot using mode %(mode)s"
@@ -847,7 +847,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "autoresume" in self.settings["options"] \
and os.path.exists(target_portdir) \
- and self.resume.is_enabled("unpack_portage") \
+ and self.resume.is_enabled("unpack_repo") \
and self.settings["snapshot_path_hash"] == snapshot_hash:
log.notice('Valid Resume point detected, skipping unpack of portage tree...')
unpack = False
@@ -868,7 +868,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write(self.settings["snapshot_path_hash"])
else:
log.info('Setting snapshot autoresume point')
- self.resume.enable("unpack_portage",
+ self.resume.enable("unpack_repo",
data = self.settings["snapshot_path_hash"])
if "snapcache" in self.settings["options"]:
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2017-03-16 22:57 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-03-16 22:57 UTC (permalink / raw
To: gentoo-commits
commit: cd9783a9c232fc2dcfdb6f2aa6d56153e0b95174
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 08:25:15 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 22:56:11 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cd9783a9
base/stagebase.py: Update the cleanables to the new repo variables
catalyst/base/stagebase.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 67382b9..d44db98 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -452,7 +452,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_cleanables(self):
self.settings["cleanables"] = ["/etc/resolv.conf", "/var/tmp/*", "/tmp/*",
- "/root/*", self.settings["portdir"]]
+ "/root/*", self.settings["repo_basedir"] + "/" +
+ self.settings["repo_name"]]
def set_snapshot_path(self):
self.settings["snapshot_path"] = file_check(
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2017-03-16 22:57 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-03-16 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 3a3c953960b807dc2dfc8372b58007eb6becdd41
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 08:56:45 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 22:56:10 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3a3c9539
base/stagebase.py: Rename unpack_portage resume point to unpack_repo
One part of the effort to separate the portage name from the repository.
catalyst/base/stagebase.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index b857a64..93c1390 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -808,7 +808,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def unpack_snapshot(self):
unpack = True
- snapshot_hash = self.resume.get("unpack_portage")
+ snapshot_hash = self.resume.get("unpack_repo")
unpack_errmsg = "Error unpacking snapshot using mode %(mode)s"
@@ -847,7 +847,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "autoresume" in self.settings["options"] \
and os.path.exists(target_portdir) \
- and self.resume.is_enabled("unpack_portage") \
+ and self.resume.is_enabled("unpack_repo") \
and self.settings["snapshot_path_hash"] == snapshot_hash:
log.notice('Valid Resume point detected, skipping unpack of portage tree...')
unpack = False
@@ -868,7 +868,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write(self.settings["snapshot_path_hash"])
else:
log.info('Setting snapshot autoresume point')
- self.resume.enable("unpack_portage",
+ self.resume.enable("unpack_repo",
data = self.settings["snapshot_path_hash"])
if "snapcache" in self.settings["options"]:
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2017-03-16 22:57 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-03-16 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 1e3d3d2914239d92d321648405f6320a7d94cc39
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 08:58:10 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 22:56:10 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1e3d3d29
base/stagebase.py: Correctly log the correct function name for unpack_snapshot()
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 93c1390..532f099 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -822,7 +822,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_portdir = normpath(self.settings["chroot_path"] +
self.settings["repo_basedir"] + "/" + self.settings["repo_name"])
log.info('%s', self.settings['chroot_path'])
- log.info('unpack(), target_portdir = %s', target_portdir)
+ log.info('unpack_snapshot(), target_portdir = %s', target_portdir)
if "snapcache" in self.settings["options"]:
snapshot_cache_hash_path = pjoin(
self.settings['snapshot_cache_path'], 'catalyst-hash')
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2017-03-11 9:35 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-03-11 9:35 UTC (permalink / raw
To: gentoo-commits
commit: a4b4e22c2d91d500198f8b15c14f7a4eb6060998
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 08:25:15 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 09:01:06 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a4b4e22c
base/stagebase.py: Update the cleanables to the new repo variables
catalyst/base/stagebase.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 31efdf6..01aced0 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -471,7 +471,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_cleanables(self):
self.settings["cleanables"] = ["/etc/resolv.conf", "/var/tmp/*", "/tmp/*",
- "/root/*", self.settings["portdir"]]
+ "/root/*", self.settings["repo_basedir"] + "/" +
+ self.settings["repo_name"]]
def set_snapshot_path(self):
self.settings["snapshot_path"] = file_check(
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2017-03-11 7:07 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-03-11 7:07 UTC (permalink / raw
To: gentoo-commits
commit: 36768e1957168bc19574fdfcd9158f8d8c7aeeeb
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 08:58:10 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 02:58:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=36768e19
base/stagebase.py: Correctly log the correct function name for unpack_snapshot()
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 35556da..677e19d 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -841,7 +841,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_portdir = normpath(self.settings["chroot_path"] +
self.settings["repo_basedir"] + "/" + self.settings["repo_name"])
log.info('%s', self.settings['chroot_path'])
- log.info('unpack(), target_portdir = %s', target_portdir)
+ log.info('unpack_snapshot(), target_portdir = %s', target_portdir)
if "snapcache" in self.settings["options"]:
snapshot_cache_hash_path = pjoin(
self.settings['snapshot_cache_path'], 'catalyst-hash')
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2017-03-11 7:07 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-03-11 7:07 UTC (permalink / raw
To: gentoo-commits
commit: dc273097757f49838e6a586daa2c33c82e378cbe
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 08:56:45 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 02:58:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=dc273097
base/stagebase.py: Rename unpack_portage resume point to unpack_repo
One part of the effort to separate the portage name from the repository.
catalyst/base/stagebase.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index eed1458..35556da 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -827,7 +827,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def unpack_snapshot(self):
unpack = True
- snapshot_hash = self.resume.get("unpack_portage")
+ snapshot_hash = self.resume.get("unpack_repo")
unpack_errmsg = "Error unpacking snapshot using mode %(mode)s"
@@ -866,7 +866,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "autoresume" in self.settings["options"] \
and os.path.exists(target_portdir) \
- and self.resume.is_enabled("unpack_portage") \
+ and self.resume.is_enabled("unpack_repo") \
and self.settings["snapshot_path_hash"] == snapshot_hash:
log.notice('Valid Resume point detected, skipping unpack of portage tree...')
unpack = False
@@ -887,7 +887,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write(self.settings["snapshot_path_hash"])
else:
log.info('Setting snapshot autoresume point')
- self.resume.enable("unpack_portage",
+ self.resume.enable("unpack_repo",
data = self.settings["snapshot_path_hash"])
if "snapcache" in self.settings["options"]:
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2017-03-09 10:02 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-03-09 10:02 UTC (permalink / raw
To: gentoo-commits
commit: d235c9e45cc72f68a7cf85a5526ef1c27233b234
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 08:58:10 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 09:59:40 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d235c9e4
base/stagebase.py: Correctly log the correct function name for unpack_snapshot()
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 35556da..677e19d 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -841,7 +841,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_portdir = normpath(self.settings["chroot_path"] +
self.settings["repo_basedir"] + "/" + self.settings["repo_name"])
log.info('%s', self.settings['chroot_path'])
- log.info('unpack(), target_portdir = %s', target_portdir)
+ log.info('unpack_snapshot(), target_portdir = %s', target_portdir)
if "snapcache" in self.settings["options"]:
snapshot_cache_hash_path = pjoin(
self.settings['snapshot_cache_path'], 'catalyst-hash')
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2017-03-09 10:02 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-03-09 10:02 UTC (permalink / raw
To: gentoo-commits
commit: bc5d169b3b4858dcd72b7fb4bae62f99c09457aa
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 08:56:45 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 09:59:39 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bc5d169b
base/stagebase.py: Rename unpack_portage resume point to unpack_repo
One part of the effort to separate the portage name from the repository.
catalyst/base/stagebase.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index eed1458..35556da 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -827,7 +827,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def unpack_snapshot(self):
unpack = True
- snapshot_hash = self.resume.get("unpack_portage")
+ snapshot_hash = self.resume.get("unpack_repo")
unpack_errmsg = "Error unpacking snapshot using mode %(mode)s"
@@ -866,7 +866,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "autoresume" in self.settings["options"] \
and os.path.exists(target_portdir) \
- and self.resume.is_enabled("unpack_portage") \
+ and self.resume.is_enabled("unpack_repo") \
and self.settings["snapshot_path_hash"] == snapshot_hash:
log.notice('Valid Resume point detected, skipping unpack of portage tree...')
unpack = False
@@ -887,7 +887,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write(self.settings["snapshot_path_hash"])
else:
log.info('Setting snapshot autoresume point')
- self.resume.enable("unpack_portage",
+ self.resume.enable("unpack_repo",
data = self.settings["snapshot_path_hash"])
if "snapcache" in self.settings["options"]:
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2017-03-09 9:39 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-03-09 9:39 UTC (permalink / raw
To: gentoo-commits
commit: f0e2c8e3c7c20287adb159647a78cfb0e0f618d8
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 08:58:10 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 09:35:12 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f0e2c8e3
base/stagebase.py: Correctly log the correct function name for unpack_snapshot()
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 7f0e5b1..0fe3c9e 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -849,7 +849,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_portdir = normpath(self.settings["chroot_path"] +
self.settings["repo_basedir"] + "/" + self.settings["repo_name"])
log.info('%s', self.settings['chroot_path'])
- log.info('unpack(), target_portdir = %s', target_portdir)
+ log.info('unpack_snapshot(), target_portdir = %s', target_portdir)
if "snapcache" in self.settings["options"]:
snapshot_cache_hash_path = pjoin(
self.settings['snapshot_cache_path'], 'catalyst-hash')
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2017-03-09 9:39 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2017-03-09 9:39 UTC (permalink / raw
To: gentoo-commits
commit: e48f720e91e419ed382d55344e5d1e63799b98f6
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 08:56:45 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 09:34:53 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e48f720e
base/stagebase.py: Rename unpack_portage resume point to unpack_repo
One part of the effort to separate the portage name from the repository.
catalyst/base/stagebase.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index ef58454..7f0e5b1 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -835,7 +835,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def unpack_snapshot(self):
unpack = True
- snapshot_hash = self.resume.get("unpack_portage")
+ snapshot_hash = self.resume.get("unpack_repo")
unpack_errmsg = "Error unpacking snapshot using mode %(mode)s"
@@ -874,7 +874,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "autoresume" in self.settings["options"] \
and os.path.exists(target_portdir) \
- and self.resume.is_enabled("unpack_portage") \
+ and self.resume.is_enabled("unpack_repo") \
and self.settings["snapshot_path_hash"] == snapshot_hash:
log.notice('Valid Resume point detected, skipping unpack of portage tree...')
unpack = False
@@ -895,7 +895,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write(self.settings["snapshot_path_hash"])
else:
log.info('Setting snapshot autoresume point')
- self.resume.enable("unpack_portage",
+ self.resume.enable("unpack_repo",
data = self.settings["snapshot_path_hash"])
if "snapcache" in self.settings["options"]:
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-11-21 1:33 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-11-21 1:33 UTC (permalink / raw
To: gentoo-commits
commit: d174bfbeb410f07a34a81c8d56b02df5b53f76ae
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 06:36:23 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 06:37:16 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d174bfbe
genbase.py: Switch from codecs.open to io.open
io.open is the builtin open() in py3
catalyst/base/genbase.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index 0c8dbb9..8af3b97 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -1,5 +1,5 @@
-import codecs
+import io
import os
@@ -18,7 +18,7 @@ class GenBase(object):
if "contents" in self.settings:
contents_map = self.settings["contents_map"]
if os.path.exists(path):
- with codecs.open(contents, "w", encoding='utf-8') as myf:
+ with io.open(contents, "w", encoding='utf-8') as myf:
keys={}
for i in self.settings["contents"].split():
keys[i]=1
@@ -36,7 +36,7 @@ class GenBase(object):
if "digests" in self.settings:
hash_map = self.settings["hash_map"]
if os.path.exists(path):
- with codecs.open(digests, "w", encoding='utf-8') as myf:
+ with io.open(digests, "w", encoding='utf-8') as myf:
keys={}
for i in self.settings["digests"].split():
keys[i]=1
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-11-21 1:33 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-11-21 1:33 UTC (permalink / raw
To: gentoo-commits
commit: 06fd1a0cd1a957c14343d9c0440dd606a883ee12
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 18:23:26 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 16:49:56 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=06fd1a0c
stagebase: robustify portage_confdir setup
When setting up the portage_confdir, we should make sure it exists,
and that we rsync it properly (regardless of the settings given by
the user).
Bugzilla: https://bugs.gentoo.org/538652
Reported-by: Joshua Kinard <kumba <AT> gentoo.org>
catalyst/base/stagebase.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 3c24dbd..6094109 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -893,8 +893,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
if "portage_confdir" in self.settings:
log.info('Configuring %s...', self.settings['port_conf'])
- cmd("rsync -a " + self.settings["portage_confdir"] + "/ " +
- self.settings["chroot_path"] + self.settings["port_conf"],
+ dest = normpath(self.settings['chroot_path'] + '/' + self.settings['port_conf'])
+ ensure_dirs(dest)
+ # The trailing slashes on both paths are important:
+ # We want to make sure rsync copies the dirs into each
+ # other and not as subdirs.
+ cmd('rsync -a %s/ %s/' % (self.settings['portage_confdir'], dest),
"Error copying %s" % self.settings["port_conf"],
env=self.env)
self.resume.enable("setup_confdir")
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-11-21 1:33 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-11-21 1:33 UTC (permalink / raw
To: gentoo-commits
commit: e606f764a51f3cfa9e8810bc6018fb88f3f813c9
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 21:41:36 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 21:41:36 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e606f764
use cp -a for portage_overlay
if makes sense to preserve things like time stamps when copying in
portage_overlay to avoid emerge thinking the files changed with every
new stage. most other places in the code use cp -a or rsync -a
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 8ea1dc4..3c24dbd 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -908,7 +908,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
cmd("mkdir -p "+self.settings["chroot_path"]+\
self.settings["local_overlay"],\
"Could not make portage_overlay dir",env=self.env)
- cmd("cp -R "+x+"/* "+self.settings["chroot_path"]+\
+ cmd("cp -a "+x+"/* "+self.settings["chroot_path"]+\
self.settings["local_overlay"],\
"Could not copy portage_overlay",env=self.env)
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-11-21 1:33 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-11-21 1:33 UTC (permalink / raw
To: gentoo-commits
commit: 986ef3f2a80c688059840d781d962bd3f3644538
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 02:18:17 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 02:18:17 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=986ef3f2
genbase: use sorted() with dict keys
In py3, the dict keys func returns a view which doesn't have a sort
member. Pass the result through sorted() which works with py2 and
py3.
catalyst/base/genbase.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index a33f924..8a1af8d 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -22,8 +22,7 @@ class GenBase(object):
keys={}
for i in self.settings["contents"].split():
keys[i]=1
- array=keys.keys()
- array.sort()
+ array = sorted(keys.keys())
for j in array:
contents = contents_map.contents(path, j,
verbose=self.settings["VERBOSE"])
@@ -42,8 +41,7 @@ class GenBase(object):
keys={}
for i in self.settings["digests"].split():
keys[i]=1
- array=keys.keys()
- array.sort()
+ array = sorted(keys.keys())
for f in [path, path + '.CONTENTS']:
if os.path.exists(f):
if "all" in array:
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2015-11-20 21:26 Brian Dolbec
2015-11-21 1:33 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2015-11-20 21:26 UTC (permalink / raw
To: gentoo-commits
commit: 20f6cd7ab2662ec23031b5a843a175a1236e83d3
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 21:23:59 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 21:24:31 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=20f6cd7a
stagebase.py: Fix the empty .../build/default/stage* directory creation
self.settings["target_path"] contained a trailing slash.
This made the os.path.dirname() operation on it only drop the trailing slash.
What was desired was the for the .../build/default path.
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 69b7b0d..62950b5 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1263,7 +1263,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
log.notice('Capture target in a tarball')
# Remove filename from path
- mypath = os.path.dirname(self.settings["target_path"])
+ mypath = os.path.dirname(self.settings["target_path"].rstrip('/'))
# Now make sure path exists
ensure_dirs(mypath)
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
2015-11-20 21:26 [gentoo-commits] proj/catalyst:master " Brian Dolbec
@ 2015-11-21 1:33 ` Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-11-21 1:33 UTC (permalink / raw
To: gentoo-commits
commit: 20f6cd7ab2662ec23031b5a843a175a1236e83d3
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 21:23:59 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 21:24:31 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=20f6cd7a
stagebase.py: Fix the empty .../build/default/stage* directory creation
self.settings["target_path"] contained a trailing slash.
This made the os.path.dirname() operation on it only drop the trailing slash.
What was desired was the for the .../build/default path.
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 69b7b0d..62950b5 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1263,7 +1263,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
log.notice('Capture target in a tarball')
# Remove filename from path
- mypath = os.path.dirname(self.settings["target_path"])
+ mypath = os.path.dirname(self.settings["target_path"].rstrip('/'))
# Now make sure path exists
ensure_dirs(mypath)
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2015-11-09 4:47 Brian Dolbec
2015-11-21 1:33 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2015-11-09 4:47 UTC (permalink / raw
To: gentoo-commits
commit: fb7d86366df544a024cbb40edbf693538432cc9e
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 9 04:45:10 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 04:45:10 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fb7d8636
genbase.py: Fix py3 compatibilty issue for contents saving
Convert to using the with statement as well.
catalyst/base/genbase.py | 54 +++++++++++++++++++++++-------------------------
1 file changed, 26 insertions(+), 28 deletions(-)
diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index 8a1af8d..4214b45 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -1,5 +1,5 @@
-
+import codecs
import os
@@ -18,17 +18,16 @@ class GenBase(object):
if "contents" in self.settings:
contents_map = self.settings["contents_map"]
if os.path.exists(path):
- myf = open(contents, "w")
- keys={}
- for i in self.settings["contents"].split():
- keys[i]=1
- array = sorted(keys.keys())
- for j in array:
- contents = contents_map.contents(path, j,
- verbose=self.settings["VERBOSE"])
- if contents:
- myf.write(contents)
- myf.close()
+ with codecs.open(contents, "w", encoding='utf-8') as myf:
+ keys={}
+ for i in self.settings["contents"].split():
+ keys[i]=1
+ array = sorted(keys.keys())
+ for j in array:
+ contents = contents_map.contents(path, j,
+ verbose=self.settings["VERBOSE"])
+ if contents:
+ myf.write(contents)
def gen_digest_file(self, path):
digests = path + ".DIGESTS"
@@ -37,20 +36,19 @@ class GenBase(object):
if "digests" in self.settings:
hash_map = self.settings["hash_map"]
if os.path.exists(path):
- myf=open(digests, "w")
- keys={}
- for i in self.settings["digests"].split():
- keys[i]=1
- array = sorted(keys.keys())
- for f in [path, path + '.CONTENTS']:
- if os.path.exists(f):
- if "all" in array:
- for k in list(hash_map.hash_map):
- digest = hash_map.generate_hash(f, hash_=k)
- myf.write(digest)
- else:
- for j in array:
- digest = hash_map.generate_hash(f, hash_=j)
- myf.write(digest)
- myf.close()
+ with codecs.open(digests, "w", encoding='utf-8') as myf:
+ keys={}
+ for i in self.settings["digests"].split():
+ keys[i]=1
+ array = sorted(keys.keys())
+ for f in [path, path + '.CONTENTS']:
+ if os.path.exists(f):
+ if "all" in array:
+ for k in list(hash_map.hash_map):
+ digest = hash_map.generate_hash(f, hash_=k)
+ myf.write(digest)
+ else:
+ for j in array:
+ digest = hash_map.generate_hash(f, hash_=j)
+ myf.write(digest)
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
2015-11-09 4:47 [gentoo-commits] proj/catalyst:master " Brian Dolbec
@ 2015-11-21 1:33 ` Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-11-21 1:33 UTC (permalink / raw
To: gentoo-commits
commit: fb7d86366df544a024cbb40edbf693538432cc9e
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 9 04:45:10 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 04:45:10 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fb7d8636
genbase.py: Fix py3 compatibilty issue for contents saving
Convert to using the with statement as well.
catalyst/base/genbase.py | 54 +++++++++++++++++++++++-------------------------
1 file changed, 26 insertions(+), 28 deletions(-)
diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index 8a1af8d..4214b45 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -1,5 +1,5 @@
-
+import codecs
import os
@@ -18,17 +18,16 @@ class GenBase(object):
if "contents" in self.settings:
contents_map = self.settings["contents_map"]
if os.path.exists(path):
- myf = open(contents, "w")
- keys={}
- for i in self.settings["contents"].split():
- keys[i]=1
- array = sorted(keys.keys())
- for j in array:
- contents = contents_map.contents(path, j,
- verbose=self.settings["VERBOSE"])
- if contents:
- myf.write(contents)
- myf.close()
+ with codecs.open(contents, "w", encoding='utf-8') as myf:
+ keys={}
+ for i in self.settings["contents"].split():
+ keys[i]=1
+ array = sorted(keys.keys())
+ for j in array:
+ contents = contents_map.contents(path, j,
+ verbose=self.settings["VERBOSE"])
+ if contents:
+ myf.write(contents)
def gen_digest_file(self, path):
digests = path + ".DIGESTS"
@@ -37,20 +36,19 @@ class GenBase(object):
if "digests" in self.settings:
hash_map = self.settings["hash_map"]
if os.path.exists(path):
- myf=open(digests, "w")
- keys={}
- for i in self.settings["digests"].split():
- keys[i]=1
- array = sorted(keys.keys())
- for f in [path, path + '.CONTENTS']:
- if os.path.exists(f):
- if "all" in array:
- for k in list(hash_map.hash_map):
- digest = hash_map.generate_hash(f, hash_=k)
- myf.write(digest)
- else:
- for j in array:
- digest = hash_map.generate_hash(f, hash_=j)
- myf.write(digest)
- myf.close()
+ with codecs.open(digests, "w", encoding='utf-8') as myf:
+ keys={}
+ for i in self.settings["digests"].split():
+ keys[i]=1
+ array = sorted(keys.keys())
+ for f in [path, path + '.CONTENTS']:
+ if os.path.exists(f):
+ if "all" in array:
+ for k in list(hash_map.hash_map):
+ digest = hash_map.generate_hash(f, hash_=k)
+ myf.write(digest)
+ else:
+ for j in array:
+ digest = hash_map.generate_hash(f, hash_=j)
+ myf.write(digest)
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2015-10-31 20:35 Brian Dolbec
2015-11-21 1:33 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2015-10-31 20:35 UTC (permalink / raw
To: gentoo-commits
commit: b409bd9bb4b50f69a555e4e148057ade86a7ed16
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 20:26:40 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 20:26:40 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b409bd9b
stagebase.py: Refactor the *FLAGS handling code in chroot_setup()
*FLAGS settings in spec files are loaded as a list.
Although the config loading code has not changed in quite some time, the code was still
treating these settings as strings. I don't know why the error was not triggered long ago.
The code now handle
catalyst/base/stagebase.py | 46 +++++++++++++++++-----------------------------
1 file changed, 17 insertions(+), 29 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 0e4d8c2..5ba9cfc 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1055,36 +1055,24 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf=open(makepath, "w")
myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n")
myf.write("# Please consult /usr/share/portage/config/make.conf.example for a more\n# detailed example.\n")
- if "CFLAGS" in self.settings:
- myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n')
- if "CXXFLAGS" in self.settings:
- if self.settings["CXXFLAGS"]!=self.settings["CFLAGS"]:
- myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n')
- else:
- myf.write('CXXFLAGS="${CFLAGS}"\n')
- else:
- myf.write('CXXFLAGS="${CFLAGS}"\n')
- if "FCFLAGS" in self.settings:
- if self.settings["FCFLAGS"]!=self.settings["CFLAGS"]:
- myf.write('FCFLAGS="'+self.settings["FCFLAGS"]+'"\n')
- else:
- myf.write('FCFLAGS="${CFLAGS}"\n')
- else:
- myf.write('FCFLAGS="${CFLAGS}"\n')
- if "FFLAGS" in self.settings:
- if self.settings["FFLAGS"]!=self.settings["CFLAGS"]:
- myf.write('FFLAGS="'+self.settings["FFLAGS"]+'"\n')
+
+ for flags in ["CFLAGS", "CXXFLAGS", "FCFLAGS", "FFLAGS", "LDFLAGS",
+ "ASFLAGS"]:
+ if not flags in self.settings:
+ continue
+ if flags in ["LDFLAGS", "ASFLAGS"]:
+ myf.write("# %s is unsupported. USE AT YOUR OWN RISK!\n"
+ % flags)
+ if (flags is not "CFLAGS" and
+ self.settings[flags] == self.settings["CFLAGS"]):
+ myf.write('%s="${CFLAGS}"\n' % flags)
+ elif isinstance(self.settings[flags], list):
+ myf.write('%s="%s"\n'
+ % (flags, ' '.join(self.settings[flags])))
else:
- myf.write('FFLAGS="${CFLAGS}"\n')
- else:
- myf.write('FFLAGS="${CFLAGS}"\n')
-
- if "LDFLAGS" in self.settings:
- myf.write("# LDFLAGS is unsupported. USE AT YOUR OWN RISK!\n")
- myf.write('LDFLAGS="'+self.settings["LDFLAGS"]+'"\n')
- if "ASFLAGS" in self.settings:
- myf.write("# ASFLAGS is unsupported. USE AT YOUR OWN RISK!\n")
- myf.write('ASFLAGS="'+self.settings["ASFLAGS"]+'"\n')
+ myf.write('%s="%s"\n'
+ % (flags, self.settings[flags]))
+
if "CBUILD" in self.settings:
myf.write("# This should not be changed unless you know exactly what you are doing. You\n# should probably be using a different stage, instead.\n")
myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n')
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
2015-10-31 20:35 [gentoo-commits] proj/catalyst:master " Brian Dolbec
@ 2015-11-21 1:33 ` Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-11-21 1:33 UTC (permalink / raw
To: gentoo-commits
commit: b409bd9bb4b50f69a555e4e148057ade86a7ed16
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 20:26:40 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 20:26:40 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b409bd9b
stagebase.py: Refactor the *FLAGS handling code in chroot_setup()
*FLAGS settings in spec files are loaded as a list.
Although the config loading code has not changed in quite some time, the code was still
treating these settings as strings. I don't know why the error was not triggered long ago.
The code now handle
catalyst/base/stagebase.py | 46 +++++++++++++++++-----------------------------
1 file changed, 17 insertions(+), 29 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 0e4d8c2..5ba9cfc 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1055,36 +1055,24 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf=open(makepath, "w")
myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n")
myf.write("# Please consult /usr/share/portage/config/make.conf.example for a more\n# detailed example.\n")
- if "CFLAGS" in self.settings:
- myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n')
- if "CXXFLAGS" in self.settings:
- if self.settings["CXXFLAGS"]!=self.settings["CFLAGS"]:
- myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n')
- else:
- myf.write('CXXFLAGS="${CFLAGS}"\n')
- else:
- myf.write('CXXFLAGS="${CFLAGS}"\n')
- if "FCFLAGS" in self.settings:
- if self.settings["FCFLAGS"]!=self.settings["CFLAGS"]:
- myf.write('FCFLAGS="'+self.settings["FCFLAGS"]+'"\n')
- else:
- myf.write('FCFLAGS="${CFLAGS}"\n')
- else:
- myf.write('FCFLAGS="${CFLAGS}"\n')
- if "FFLAGS" in self.settings:
- if self.settings["FFLAGS"]!=self.settings["CFLAGS"]:
- myf.write('FFLAGS="'+self.settings["FFLAGS"]+'"\n')
+
+ for flags in ["CFLAGS", "CXXFLAGS", "FCFLAGS", "FFLAGS", "LDFLAGS",
+ "ASFLAGS"]:
+ if not flags in self.settings:
+ continue
+ if flags in ["LDFLAGS", "ASFLAGS"]:
+ myf.write("# %s is unsupported. USE AT YOUR OWN RISK!\n"
+ % flags)
+ if (flags is not "CFLAGS" and
+ self.settings[flags] == self.settings["CFLAGS"]):
+ myf.write('%s="${CFLAGS}"\n' % flags)
+ elif isinstance(self.settings[flags], list):
+ myf.write('%s="%s"\n'
+ % (flags, ' '.join(self.settings[flags])))
else:
- myf.write('FFLAGS="${CFLAGS}"\n')
- else:
- myf.write('FFLAGS="${CFLAGS}"\n')
-
- if "LDFLAGS" in self.settings:
- myf.write("# LDFLAGS is unsupported. USE AT YOUR OWN RISK!\n")
- myf.write('LDFLAGS="'+self.settings["LDFLAGS"]+'"\n')
- if "ASFLAGS" in self.settings:
- myf.write("# ASFLAGS is unsupported. USE AT YOUR OWN RISK!\n")
- myf.write('ASFLAGS="'+self.settings["ASFLAGS"]+'"\n')
+ myf.write('%s="%s"\n'
+ % (flags, self.settings[flags]))
+
if "CBUILD" in self.settings:
myf.write("# This should not be changed unless you know exactly what you are doing. You\n# should probably be using a different stage, instead.\n")
myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n')
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2015-10-31 20:35 Brian Dolbec
2015-11-21 1:33 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2015-10-31 20:35 UTC (permalink / raw
To: gentoo-commits
commit: bed0a9c2c1585a50738ceb49561d73d37bc6e050
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 20:30:35 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 20:30:35 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bed0a9c2
stagebase.py: Clean up some long lines
While I was changing code nearby, shorten some overly long lines.
catalyst/base/stagebase.py | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 5ba9cfc..ffd84de 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1053,8 +1053,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
cmd("rm -f " + makepath,\
"Could not remove " + makepath, env=self.env)
myf=open(makepath, "w")
- myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n")
- myf.write("# Please consult /usr/share/portage/config/make.conf.example for a more\n# detailed example.\n")
+ myf.write("# These settings were set by the catalyst build script "
+ "that automatically\n# built this stage.\n")
+ myf.write("# Please consult "
+ "/usr/share/portage/config/make.conf.example "
+ "for a more\n# detailed example.\n")
for flags in ["CFLAGS", "CXXFLAGS", "FCFLAGS", "FFLAGS", "LDFLAGS",
"ASFLAGS"]:
@@ -1074,11 +1077,16 @@ class StageBase(TargetBase, ClearBase, GenBase):
% (flags, self.settings[flags]))
if "CBUILD" in self.settings:
- myf.write("# This should not be changed unless you know exactly what you are doing. You\n# should probably be using a different stage, instead.\n")
+ myf.write("# This should not be changed unless you know exactly"
+ " what you are doing. You\n# should probably be "
+ "using a different stage, instead.\n")
myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n')
if "CHOST" in self.settings:
- myf.write("# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable before changing.\n")
+ myf.write("# WARNING: Changing your CHOST is not something "
+ "that should be done lightly.\n# Please consult "
+ "https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable "
+ "before changing.\n")
myf.write('CHOST="'+self.settings["CHOST"]+'"\n')
# Figure out what our USE vars are for building
@@ -1090,7 +1098,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
myusevars.extend(self.settings["use"])
if myusevars:
- myf.write("# These are the USE and USE_EXPAND flags that were used for\n# building in addition to what is provided by the profile.\n")
+ myf.write("# These are the USE and USE_EXPAND flags that were "
+ "used for\n# building in addition to what is provided "
+ "by the profile.\n")
myusevars = sorted(set(myusevars))
myf.write('USE="' + ' '.join(myusevars) + '"\n')
if '-*' in myusevars:
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
2015-10-31 20:35 [gentoo-commits] proj/catalyst:master " Brian Dolbec
@ 2015-11-21 1:33 ` Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-11-21 1:33 UTC (permalink / raw
To: gentoo-commits
commit: bed0a9c2c1585a50738ceb49561d73d37bc6e050
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 20:30:35 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 20:30:35 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bed0a9c2
stagebase.py: Clean up some long lines
While I was changing code nearby, shorten some overly long lines.
catalyst/base/stagebase.py | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 5ba9cfc..ffd84de 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1053,8 +1053,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
cmd("rm -f " + makepath,\
"Could not remove " + makepath, env=self.env)
myf=open(makepath, "w")
- myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n")
- myf.write("# Please consult /usr/share/portage/config/make.conf.example for a more\n# detailed example.\n")
+ myf.write("# These settings were set by the catalyst build script "
+ "that automatically\n# built this stage.\n")
+ myf.write("# Please consult "
+ "/usr/share/portage/config/make.conf.example "
+ "for a more\n# detailed example.\n")
for flags in ["CFLAGS", "CXXFLAGS", "FCFLAGS", "FFLAGS", "LDFLAGS",
"ASFLAGS"]:
@@ -1074,11 +1077,16 @@ class StageBase(TargetBase, ClearBase, GenBase):
% (flags, self.settings[flags]))
if "CBUILD" in self.settings:
- myf.write("# This should not be changed unless you know exactly what you are doing. You\n# should probably be using a different stage, instead.\n")
+ myf.write("# This should not be changed unless you know exactly"
+ " what you are doing. You\n# should probably be "
+ "using a different stage, instead.\n")
myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n')
if "CHOST" in self.settings:
- myf.write("# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable before changing.\n")
+ myf.write("# WARNING: Changing your CHOST is not something "
+ "that should be done lightly.\n# Please consult "
+ "https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable "
+ "before changing.\n")
myf.write('CHOST="'+self.settings["CHOST"]+'"\n')
# Figure out what our USE vars are for building
@@ -1090,7 +1098,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
myusevars.extend(self.settings["use"])
if myusevars:
- myf.write("# These are the USE and USE_EXPAND flags that were used for\n# building in addition to what is provided by the profile.\n")
+ myf.write("# These are the USE and USE_EXPAND flags that were "
+ "used for\n# building in addition to what is provided "
+ "by the profile.\n")
myusevars = sorted(set(myusevars))
myf.write('USE="' + ' '.join(myusevars) + '"\n')
if '-*' in myusevars:
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2015-09-08 14:17 Brian Dolbec
2015-09-08 14:14 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2015-09-08 14:17 UTC (permalink / raw
To: gentoo-commits
commit: 36830d602086d0b5dc00e548dc10619a77d9b30f
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 06:34:06 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 14:11:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=36830d60
Fix snapshot setting print message
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 31fbe8b..17d88cd 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -483,7 +483,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["snapshot"]))
self.snapcache_lock=\
LockDir(self.settings["snapshot_cache_path"])
- print "Caching snapshot to "+self.settings["snapshot_cache_path"]
+ print "Setting snapshot cache to "+self.settings["snapshot_cache_path"]
def set_chroot_path(self):
"""
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
2015-09-08 14:17 [gentoo-commits] proj/catalyst:master " Brian Dolbec
@ 2015-09-08 14:14 ` Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-08 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 36830d602086d0b5dc00e548dc10619a77d9b30f
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 06:34:06 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 14:11:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=36830d60
Fix snapshot setting print message
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 31fbe8b..17d88cd 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -483,7 +483,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["snapshot"]))
self.snapcache_lock=\
LockDir(self.settings["snapshot_cache_path"])
- print "Caching snapshot to "+self.settings["snapshot_cache_path"]
+ print "Setting snapshot cache to "+self.settings["snapshot_cache_path"]
def set_chroot_path(self):
"""
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2015-09-08 14:17 Brian Dolbec
2015-09-08 14:14 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2015-09-08 14:17 UTC (permalink / raw
To: gentoo-commits
commit: 85de4ce7be209e29ef661256293b6168bcadd1a0
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 06:35:17 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 14:11:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=85de4ce7
stagebase.py: run() Add in an exception trap to cleanup mounts
catalyst/base/stagebase.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index a6694e6..bd6938c 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1421,7 +1421,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
for x in self.settings["action_sequence"]:
print "--- Running action sequence: "+x
sys.stdout.flush()
- apply(getattr(self,x))
+ try:
+ apply(getattr(self,x))
+ except Exception as error:
+ print "Exception running action sequence %s" % x
+ print "Error:", str(error)
+ print "Running unbind()"
+ self.unbind()
+ break
def unmerge(self):
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
2015-09-08 14:17 [gentoo-commits] proj/catalyst:master " Brian Dolbec
@ 2015-09-08 14:14 ` Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-08 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 85de4ce7be209e29ef661256293b6168bcadd1a0
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 06:35:17 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 14:11:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=85de4ce7
stagebase.py: run() Add in an exception trap to cleanup mounts
catalyst/base/stagebase.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index a6694e6..bd6938c 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1421,7 +1421,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
for x in self.settings["action_sequence"]:
print "--- Running action sequence: "+x
sys.stdout.flush()
- apply(getattr(self,x))
+ try:
+ apply(getattr(self,x))
+ except Exception as error:
+ print "Exception running action sequence %s" % x
+ print "Error:", str(error)
+ print "Running unbind()"
+ self.unbind()
+ break
def unmerge(self):
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-09-08 14:14 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-08 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 5de472ce61d13d242e185a9f6d88b26610fb014b
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 06:26:27 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 14:05:13 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5de472ce
stagebase.py: strip a trailing slash from the croot_path for consistency
target_subpath must have a trailing slash to prevent some failures.
See commit: 5b08b471611670b4cc996e45c387ecd951fb2142
Subject: Fix livecd source and target paths not ending with a slash
Author: Brian Dolbec <dolsen <AT> gentoo.org> (Wed 12 Jun 2013 07:40:12 AM PDT)
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 8f12ac6..a6694e6 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -500,7 +500,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
Things *could* break if you don't use a proper join()
"""
self.settings["chroot_path"]=normpath(self.settings["storedir"]+\
- "/tmp/"+self.settings["target_subpath"])
+ "/tmp/"+self.settings["target_subpath"].rstrip('/'))
self.chroot_lock=LockDir(self.settings["chroot_path"])
def set_autoresume_path(self):
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-09-06 21:18 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-06 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 16f6184fc18508fc4604d4ddc85624701bb15176
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 16:31:33 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 21:18:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=16f6184f
catalyst/base/stagebase.py: Fix "Creating stage tarball..." print()
catalyst/base/stagebase.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 655ea06..ea37591 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1307,7 +1307,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_filename = ".".join([self.settings["target_path"].rstrip('/'),
self.compressor.extension(pack_info['mode'])])
- print "Creating stage tarball..."
+ print("Creating stage tarball... mode:",
+ self.settings["compression_mode"])
if self.compressor.compress(pack_info):
self.gen_contents_file(target_filename)
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-09-04 15:20 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-04 15:20 UTC (permalink / raw
To: gentoo-commits
commit: 60ad85c8bc992c8eebacb8ba7a7edbe4462eef9e
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 16:31:33 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 15:19:57 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=60ad85c8
catalyst/base/stagebase.py: Fix "Creating stage tarball..." print()
catalyst/base/stagebase.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 655ea06..ea37591 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1307,7 +1307,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_filename = ".".join([self.settings["target_path"].rstrip('/'),
self.compressor.extension(pack_info['mode'])])
- print "Creating stage tarball..."
+ print("Creating stage tarball... mode:",
+ self.settings["compression_mode"])
if self.compressor.compress(pack_info):
self.gen_contents_file(target_filename)
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-09-03 15:14 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-03 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 75cdef7e4593d3de0c407610ae2f3a55b1859336
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 2 21:23:10 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 21:23:10 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=75cdef7e
fix minor typo
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index c0bafc2..23491aa 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1097,7 +1097,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myusevars.extend(self.settings["use"])
if myusevars:
- myf.write("# These are the USE and USE_EXPAND flags that were used for\n# buidling in addition to what is provided by the profile.\n")
+ myf.write("# These are the USE and USE_EXPAND flags that were used for\n# building in addition to what is provided by the profile.\n")
myusevars = sorted(set(myusevars))
myf.write('USE="'+string.join(myusevars)+'"\n')
if '-*' in myusevars:
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-09-03 15:14 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-03 15:14 UTC (permalink / raw
To: gentoo-commits
commit: fc30e2ab67dd74c6f52a042587a32d528fa576cf
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 16:31:33 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 15:09:02 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fc30e2ab
catalyst/base/stagebase.py: Fix "Creating stage tarball..." print()
catalyst/base/stagebase.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index aba330e..7231303 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1307,7 +1307,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_filename = ".".join([self.settings["target_path"],
self.compressor.extension(pack_info['mode'])])
- print "Creating stage tarball..."
+ print("Creating stage tarball... mode:",
+ self.settings["compression_mode"])
if self.compressor.compress(pack_info):
self.gen_contents_file(target_filename)
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-09-03 15:14 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-03 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 827a9cd7ea1863242920651752a8265acc8d57ad
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 2 21:52:48 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 21:52:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=827a9cd7
support setting/overriding fcflags and fflags, specifically for use with CFLAGS=-frecord-gcc-switches
catalyst/base/stagebase.py | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 23491aa..d898e95 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -38,7 +38,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.valid_values.extend(["version_stamp","target","subarch",\
"rel_type","profile","snapshot","source_subpath","portage_confdir",\
- "cflags","cxxflags","ldflags","cbuild","hostuse","portage_overlay",\
+ "cflags","cxxflags","fcflags","fflags","ldflags","cbuild","hostuse","portage_overlay",\
"distcc_hosts","makeopts","pkgcache_path","kerncache_path"])
self.set_valid_build_kernel_vars(addlargs)
@@ -280,6 +280,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "CXXFLAGS" in self.makeconf:
self.settings["CXXFLAGS"]=self.makeconf["CXXFLAGS"]
+ def override_fcflags(self):
+ if "FCFLAGS" in self.makeconf:
+ self.settings["FCFLAGS"]=self.makeconf["FCFLAGS"]
+
+ def override_fflags(self):
+ if "FFLAGS" in self.makeconf:
+ self.settings["FFLAGS"]=self.makeconf["FFLAGS"]
+
def override_ldflags(self):
if "LDFLAGS" in self.makeconf:
self.settings["LDFLAGS"]=self.makeconf["LDFLAGS"]
@@ -1020,6 +1028,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.override_chost()
self.override_cflags()
self.override_cxxflags()
+ self.override_fcflags()
+ self.override_fflags()
self.override_ldflags()
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("chroot_setup"):
@@ -1077,6 +1087,20 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write('CXXFLAGS="${CFLAGS}"\n')
else:
myf.write('CXXFLAGS="${CFLAGS}"\n')
+ if "FCFLAGS" in self.settings:
+ if self.settings["FCFLAGS"]!=self.settings["CFLAGS"]:
+ myf.write('FCFLAGS="'+self.settings["FCFLAGS"]+'"\n')
+ else:
+ myf.write('FCFLAGS="${CFLAGS}"\n')
+ else:
+ myf.write('FCFLAGS="${CFLAGS}"\n')
+ if "FFLAGS" in self.settings:
+ if self.settings["FFLAGS"]!=self.settings["CFLAGS"]:
+ myf.write('FFLAGS="'+self.settings["FFLAGS"]+'"\n')
+ else:
+ myf.write('FFLAGS="${CFLAGS}"\n')
+ else:
+ myf.write('FFLAGS="${CFLAGS}"\n')
if "LDFLAGS" in self.settings:
myf.write("# LDFLAGS is unsupported. USE AT YOUR OWN RISK!\n")
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-09-03 15:14 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-03 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 5d253b20dc206c3de4c9b96b01fc4dd507aaadf7
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 2 20:59:51 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 20:59:51 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5d253b20
stagebase.py: Add a _debub_pause_ finction
It can then be inserted into the action_sequence assignments to do troubleshooting
and other debug snooping to determine where a problem is occuring.
eg:
def set_action_sequence(self):
self.settings["action_sequence"]=["unpack","unpack_snapshot",\
"config_profile_link","setup_confdir","portage_overlay",\
"bind","chroot_setup", "_debug_pause_","setup_environment",
"_debug_pause_", "build_packages", ...]
catalyst/base/stagebase.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 25e5b6c..c0bafc2 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -21,6 +21,11 @@ from catalyst.lock import LockDir
from catalyst.fileops import ensure_dirs, pjoin
from catalyst.base.resume import AutoResume
+if sys.version_info[0] >= 3:
+ py_input = input
+else:
+ py_input = raw_input
+
class StageBase(TargetBase, ClearBase, GenBase):
"""
@@ -1624,4 +1629,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.unbind()
raise CatalystError("build aborting due to livecd_update error.")
+ def _debug_pause_(self):
+ py_input("press any key to continue: ")
+
# vim: ts=4 sw=4 sta et sts=4 ai
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-09-03 15:14 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-03 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 99fc43024db4be08fbfbff3a6a79c90db920e927
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 1 19:40:15 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 1 19:40:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=99fc4302
drop --selinux switch from tar
tar --selinux isn't support unless you are on selinux, and in that case
things are still not likely to be right do to the dark magic that is selinux.
From the head of the selinux team:
<@SwifT> Zero_Chaos: let's not use tar --selinux right now until we have updated catalyst to create selinux-enabled chroots
catalyst/base/stagebase.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 6adc3b9..25e5b6c 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -696,10 +696,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time) ...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of "+\
self.settings["source_path"]+" to "+\
@@ -711,10 +711,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time) ...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of "+self.settings["source_path"]+\
" to "+self.settings["chroot_path"]+" failed."
@@ -806,9 +806,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
"catalyst-hash")
destdir=self.settings["snapshot_cache_path"]
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -xpf "+self.settings["snapshot_path"]+" -C "+destdir
unpack_errmsg="Error unpacking snapshot"
cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
self.settings["snapshot_cache_path"]+\
@@ -825,10 +825,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
cleanup_msg=\
"Cleaning up existing portage tree (This can take a long time)..."
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
unpack_errmsg="Error unpacking snapshot"
@@ -1256,7 +1256,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
print "Creating stage tarball..."
- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
self.settings["stage_path"]+" .",\
"Couldn't create stage tarball",env=self.env)
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-09-01 5:58 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-01 5:58 UTC (permalink / raw
To: gentoo-commits
commit: 8c02a9bcfae418c2e48b05299c54e437bf97d246
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 16:31:33 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 1 05:54:11 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8c02a9bc
catalyst/base/stagebase.py: Fix "Creating stage tarball..." print()
catalyst/base/stagebase.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 2e175f1..e07e2c2 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1278,7 +1278,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_filename = ".".join([self.settings["target_path"],
self.compressor.extension(pack_info['mode'])])
- print "Creating stage tarball..."
+ print("Creating stage tarball... mode:",
+ self.settings["compression_mode"])
if self.compressor.compress(pack_info):
self.gen_contents_file(target_filename)
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-09-01 5:58 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-09-01 5:58 UTC (permalink / raw
To: gentoo-commits
commit: 3768757b9f31bcf34f8aac853f24cf97096dabb9
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 19:21:50 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 19:21:50 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3768757b
drop redundant make.conf.catalyst
catalyst/base/stagebase.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 4c7f029..6adc3b9 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1119,10 +1119,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write('PORTDIR_OVERLAY="/usr/local/portage"\n')
myf.close()
- makepath = normpath(self.settings["chroot_path"] +
- self.settings["make_conf"])
- cmd("cp " + makepath + " " + makepath + ".catalyst",\
- "Could not backup " + self.settings["make_conf"],env=self.env)
self.resume.enable("chroot_setup")
def fsscript(self):
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-06-15 20:25 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-06-15 20:25 UTC (permalink / raw
To: gentoo-commits
commit: eebe07d435107f67418e838b34ecd036039bd453
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 16:31:33 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 16:31:33 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=eebe07d4
catalyst/base/stagebase.py: Fix "Creating stage tarball..." print()
catalyst/base/stagebase.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 20b9e69..73b930b 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1279,7 +1279,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_filename = ".".join([self.settings["target_path"],
self.compressor.extension(pack_info['mode'])])
- print "Creating stage tarball..."
+ print("Creating stage tarball... mode:",
+ self.settings["compression_mode"])
if self.compressor.compress(pack_info):
self.gen_contents_file(target_filename)
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2015-05-24 0:08 Brian Dolbec
2015-05-21 23:53 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2015-05-24 0:08 UTC (permalink / raw
To: gentoo-commits
commit: de00f5ffe2b626881dc90aa3d8ff322eba5c5c5d
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 19 03:21:16 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 02:34:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=de00f5ff
Do not untar with --acls, fixes bug #536762
catalyst/base/stagebase.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index dee947f..5200182 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -696,10 +696,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time) ...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of "+\
self.settings["source_path"]+" to "+\
@@ -711,10 +711,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time) ...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of "+self.settings["source_path"]+\
" to "+self.settings["chroot_path"]+" failed."
@@ -806,9 +806,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
"catalyst-hash")
destdir=self.settings["snapshot_cache_path"]
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
unpack_errmsg="Error unpacking snapshot"
cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
self.settings["snapshot_cache_path"]+\
@@ -825,10 +825,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
cleanup_msg=\
"Cleaning up existing portage tree (This can take a long time)..."
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
unpack_errmsg="Error unpacking snapshot"
@@ -1248,7 +1248,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
print "Creating stage tarball..."
- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
self.settings["stage_path"]+" .",\
"Couldn't create stage tarball",env=self.env)
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
2015-05-24 0:08 [gentoo-commits] proj/catalyst:master " Brian Dolbec
@ 2015-05-21 23:53 ` Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-05-21 23:53 UTC (permalink / raw
To: gentoo-commits
commit: de00f5ffe2b626881dc90aa3d8ff322eba5c5c5d
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 19 03:21:16 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 02:34:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=de00f5ff
Do not untar with --acls, fixes bug #536762
catalyst/base/stagebase.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index dee947f..5200182 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -696,10 +696,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time) ...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of "+\
self.settings["source_path"]+" to "+\
@@ -711,10 +711,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time) ...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of "+self.settings["source_path"]+\
" to "+self.settings["chroot_path"]+" failed."
@@ -806,9 +806,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
"catalyst-hash")
destdir=self.settings["snapshot_cache_path"]
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
unpack_errmsg="Error unpacking snapshot"
cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
self.settings["snapshot_cache_path"]+\
@@ -825,10 +825,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
cleanup_msg=\
"Cleaning up existing portage tree (This can take a long time)..."
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
else:
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
unpack_errmsg="Error unpacking snapshot"
@@ -1248,7 +1248,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
print "Creating stage tarball..."
- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
self.settings["stage_path"]+" .",\
"Couldn't create stage tarball",env=self.env)
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2015-05-24 0:08 Brian Dolbec
2015-05-21 23:53 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2015-05-24 0:08 UTC (permalink / raw
To: gentoo-commits
commit: 124c29ecc7aeb0311fc8e6149196476b580ae735
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 1 16:58:24 2014 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 22:57:52 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=124c29ec
catalyst/base/clearbase.py: Fix remove parameter mistakes.
fixes commit: 02b3cb7a8d5c9d8d21105feda6868080416721c1
Add remove_chroot and remove_autoresume functions.
Brian Dolbec <dolsen <AT> gentoo.org> (Tue 31 Dec 2013 01:04:29 AM PST)
catalyst/base/clearbase.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index a9f1d22..b2c1a11 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -55,10 +55,10 @@ class ClearBase(object):
if any(k in self.settings["options"] for k in ("purge",
"purgeonly", "purgetmponly")):
print "purge(); clearing autoresume ..."
- self.clear_autoresume(remove)
+ self.clear_autoresume()
print "purge(); clearing chroot ..."
- self.clear_chroot(remove)
+ self.clear_chroot()
if "purgetmponly" not in self.settings["options"]:
print "purge(); clearing package cache ..."
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
2015-05-24 0:08 [gentoo-commits] proj/catalyst:master " Brian Dolbec
@ 2015-05-21 23:53 ` Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-05-21 23:53 UTC (permalink / raw
To: gentoo-commits
commit: 124c29ecc7aeb0311fc8e6149196476b580ae735
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 1 16:58:24 2014 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 22:57:52 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=124c29ec
catalyst/base/clearbase.py: Fix remove parameter mistakes.
fixes commit: 02b3cb7a8d5c9d8d21105feda6868080416721c1
Add remove_chroot and remove_autoresume functions.
Brian Dolbec <dolsen <AT> gentoo.org> (Tue 31 Dec 2013 01:04:29 AM PST)
catalyst/base/clearbase.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index a9f1d22..b2c1a11 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -55,10 +55,10 @@ class ClearBase(object):
if any(k in self.settings["options"] for k in ("purge",
"purgeonly", "purgetmponly")):
print "purge(); clearing autoresume ..."
- self.clear_autoresume(remove)
+ self.clear_autoresume()
print "purge(); clearing chroot ..."
- self.clear_chroot(remove)
+ self.clear_chroot()
if "purgetmponly" not in self.settings["options"]:
print "purge(); clearing package cache ..."
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-05-21 23:53 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-05-21 23:53 UTC (permalink / raw
To: gentoo-commits
commit: e458b1d4d8c05da72702ba8e9a71028c9a5c9e0e
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 19 01:16:15 2014 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 02:32:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e458b1d4
Continue commit 2fea87234ffc48c3dd96f1204b27f667f5ade3a3 as we need to use --xattr-include when extracting the stages.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
catalyst/base/stagebase.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 4d9ff0d..dee947f 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -696,10 +696,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time) ...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of "+\
self.settings["source_path"]+" to "+\
@@ -711,10 +711,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time) ...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of "+self.settings["source_path"]+\
" to "+self.settings["chroot_path"]+" failed."
@@ -806,9 +806,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
"catalyst-hash")
destdir=self.settings["snapshot_cache_path"]
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
else:
- unpack_cmd="tar --xattrs --acls -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
unpack_errmsg="Error unpacking snapshot"
cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
self.settings["snapshot_cache_path"]+\
@@ -825,10 +825,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
cleanup_msg=\
"Cleaning up existing portage tree (This can take a long time)..."
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
else:
- unpack_cmd="tar --xattrs --acls -xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
unpack_errmsg="Error unpacking snapshot"
@@ -1248,7 +1248,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
print "Creating stage tarball..."
- cmd("tar --xattrs --acls -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
self.settings["stage_path"]+" .",\
"Couldn't create stage tarball",env=self.env)
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-05-21 23:53 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-05-21 23:53 UTC (permalink / raw
To: gentoo-commits
commit: 4f3065cbefa8976f77a52689298bb4ab38ab2317
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 6 17:30:01 2014 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 02:32:23 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4f3065cb
Use -xpf instead of xpf with tar so it doesn't complain about missing option.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
catalyst/base/stagebase.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index a33cae4..4d9ff0d 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -808,7 +808,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "bz2" == self.settings["chroot_path"][-3:]:
unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
else:
- unpack_cmd="tar --xattrs --acls xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs --acls -xpf "+self.settings["snapshot_path"]+" -C "+destdir
unpack_errmsg="Error unpacking snapshot"
cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
self.settings["snapshot_cache_path"]+\
@@ -828,7 +828,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
else:
- unpack_cmd="tar --xattrs --acls xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --acls -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
unpack_errmsg="Error unpacking snapshot"
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-05-21 23:53 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-05-21 23:53 UTC (permalink / raw
To: gentoo-commits
commit: b0e858758ed20aa79045e282b96229320170aeb9
Author: Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 5 10:40:01 2014 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b0e85875
Allow kernelopts as a valid value for kernels.
catalyst/base/stagebase.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 191baab..c94f6b6 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -616,6 +616,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
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")
if "boot/kernel/"+x+"/packages" in addlargs:
if type(addlargs["boot/kernel/"+x+\
"/packages"])==types.StringType:
^ permalink raw reply related [flat|nested] 43+ messages in thread* [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
@ 2015-02-26 22:18 Brian Dolbec
2015-02-26 20:44 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
0 siblings, 1 reply; 43+ messages in thread
From: Brian Dolbec @ 2015-02-26 22:18 UTC (permalink / raw
To: gentoo-commits
commit: a8d406680bb626105407d66905bb8de82349fa03
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 09:00:16 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 20:04:57 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a8d40668
Report the task exception that occurred.
---
catalyst/base/stagebase.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 7395351..1b09935 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1332,9 +1332,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
sys.stdout.flush()
try:
apply(getattr(self,x))
- except:
+ except Exception as e:
+ print "--- Exeption running action sequence:" + x
self.mount_safety_check()
- raise
+ raise e
self.chroot_lock.unlock()
^ permalink raw reply related [flat|nested] 43+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
@ 2015-01-01 5:59 Brian Dolbec
0 siblings, 0 replies; 43+ messages in thread
From: Brian Dolbec @ 2015-01-01 5:59 UTC (permalink / raw
To: gentoo-commits
commit: 80493d8d32cb21d622bb2f514da68ac3106b7c35
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 06:24:46 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Jan 1 05:58:07 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=80493d8d
Refactor ClearBase code to remove code duplication.
---
catalyst/base/clearbase.py | 73 ++++++++++++++++++----------------------------
1 file changed, 29 insertions(+), 44 deletions(-)
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index 585d4f2..8462a3c 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -41,60 +41,20 @@ class ClearBase(object):
def clear_chroot(self):
- myemp=self.settings["chroot_path"]
- if os.path.isdir(myemp):
- print "Emptying directory",myemp
- """
- stat the dir, delete the dir, recreate the dir and set
- the proper perms and ownership
- """
- mystat=os.stat(myemp)
- #cmd("rm -rf "+myemp, "Could not remove existing file: "+myemp,env=self.env)
- """ There's no easy way to change flags recursively in python """
- if os.uname()[0] == "FreeBSD":
- os.system("chflags -R noschg "+myemp)
- shutil.rmtree(myemp)
- ensure_dirs(myemp, mode=0755)
- os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
- os.chmod(myemp,mystat[ST_MODE])
+ print 'Clearing the chroot path ...'
+ self.clear_dir(self.settings["chroot_path"], 0755, True)
def clear_packages(self):
if "pkgcache" in self.settings["options"]:
print "purging the pkgcache ..."
-
- myemp=self.settings["pkgcache_path"]
- if os.path.isdir(myemp):
- print "Emptying directory",myemp
- """
- stat the dir, delete the dir, recreate the dir and set
- the proper perms and ownership
- """
- mystat=os.stat(myemp)
- #cmd("rm -rf "+myemp, "Could not remove existing file: "+myemp,env=self.env)
- shutil.rmtree(myemp)
- ensure_dirs(myemp, mode=0755)
- os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
- os.chmod(myemp,mystat[ST_MODE])
+ self.clear_dir(self.settings["pkgcache_path"])
def clear_kerncache(self):
if "kerncache" in self.settings["options"]:
print "purging the kerncache ..."
-
- myemp=self.settings["kerncache_path"]
- if os.path.isdir(myemp):
- print "Emptying directory",myemp
- """
- stat the dir, delete the dir, recreate the dir and set
- the proper perms and ownership
- """
- mystat=os.stat(myemp)
- #cmd("rm -rf "+myemp, "Could not remove existing file: "+myemp,env=self.env)
- shutil.rmtree(myemp)
- ensure_dirs(myemp, mode=0755)
- os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
- os.chmod(myemp,mystat[ST_MODE])
+ self.clear_dir(self.settings["kerncache_path"])
def purge(self):
@@ -113,3 +73,28 @@ class ClearBase(object):
print "clearing kerncache ..."
self.clear_kerncache()
+
+ def clear_dir(self, myemp, mode=0755, chg_flags=False):
+ '''Universal directory clearing function
+ '''
+ if not myemp:
+ return False
+ if os.path.isdir(myemp):
+ print "Emptying directory" , myemp
+ """
+ stat the dir, delete the dir, recreate the dir and set
+ the proper perms and ownership
+ """
+ try:
+ mystat=os.stat(myemp)
+ """ There's no easy way to change flags recursively in python """
+ if chg_flags and os.uname()[0] == "FreeBSD":
+ os.system("chflags -R noschg " + myemp)
+ shutil.rmtree(myemp)
+ ensure_dirs(myemp, mode=mode)
+ os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
+ os.chmod(myemp,mystat[ST_MODE])
+ except Exception as e:
+ print CatalystError("clear_dir(); Exeption: %s" % str(e))
+ return False
+ return True
^ permalink raw reply related [flat|nested] 43+ messages in thread
end of thread, other threads:[~2017-11-22 15:52 UTC | newest]
Thread overview: 43+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-24 0:08 [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ Brian Dolbec
2015-05-21 23:53 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
-- strict thread matches above, loose matches on Subject: below --
2017-11-29 17:20 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2017-11-22 15:52 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2017-11-29 17:20 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2017-11-22 15:52 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2017-11-22 15:52 Brian Dolbec
2017-03-16 22:57 Brian Dolbec
2017-03-16 22:57 Brian Dolbec
2017-03-16 22:57 Brian Dolbec
2017-03-11 9:35 Brian Dolbec
2017-03-11 7:07 Brian Dolbec
2017-03-11 7:07 Brian Dolbec
2017-03-09 10:02 Brian Dolbec
2017-03-09 10:02 Brian Dolbec
2017-03-09 9:39 Brian Dolbec
2017-03-09 9:39 Brian Dolbec
2015-11-21 1:33 Brian Dolbec
2015-11-21 1:33 Brian Dolbec
2015-11-21 1:33 Brian Dolbec
2015-11-21 1:33 Brian Dolbec
2015-11-20 21:26 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-11-21 1:33 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-11-09 4:47 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-11-21 1:33 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-10-31 20:35 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-11-21 1:33 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-10-31 20:35 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-11-21 1:33 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-09-08 14:17 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-09-08 14:14 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-09-08 14:17 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-09-08 14:14 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-09-08 14:14 Brian Dolbec
2015-09-06 21:18 Brian Dolbec
2015-09-04 15:20 Brian Dolbec
2015-09-03 15:14 Brian Dolbec
2015-09-03 15:14 Brian Dolbec
2015-09-03 15:14 Brian Dolbec
2015-09-03 15:14 Brian Dolbec
2015-09-03 15:14 Brian Dolbec
2015-09-01 5:58 Brian Dolbec
2015-09-01 5:58 Brian Dolbec
2015-06-15 20:25 Brian Dolbec
2015-05-24 0:08 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-05-21 23:53 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-05-24 0:08 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-05-21 23:53 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-05-21 23:53 Brian Dolbec
2015-05-21 23:53 Brian Dolbec
2015-05-21 23:53 Brian Dolbec
2015-02-26 22:18 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-02-26 20:44 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-01-01 5:59 Brian Dolbec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox