| 1 |
commit: bed0a9c2c1585a50738ceb49561d73d37bc6e050 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 31 20:30:35 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 31 20:30:35 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bed0a9c2 |
| 7 |
|
| 8 |
stagebase.py: Clean up some long lines |
| 9 |
|
| 10 |
While I was changing code nearby, shorten some overly long lines. |
| 11 |
|
| 12 |
catalyst/base/stagebase.py | 20 +++++++++++++++----- |
| 13 |
1 file changed, 15 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 16 |
index 5ba9cfc..ffd84de 100644 |
| 17 |
--- a/catalyst/base/stagebase.py |
| 18 |
+++ b/catalyst/base/stagebase.py |
| 19 |
@@ -1053,8 +1053,11 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 20 |
cmd("rm -f " + makepath,\ |
| 21 |
"Could not remove " + makepath, env=self.env) |
| 22 |
myf=open(makepath, "w") |
| 23 |
- myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n") |
| 24 |
- myf.write("# Please consult /usr/share/portage/config/make.conf.example for a more\n# detailed example.\n") |
| 25 |
+ myf.write("# These settings were set by the catalyst build script " |
| 26 |
+ "that automatically\n# built this stage.\n") |
| 27 |
+ myf.write("# Please consult " |
| 28 |
+ "/usr/share/portage/config/make.conf.example " |
| 29 |
+ "for a more\n# detailed example.\n") |
| 30 |
|
| 31 |
for flags in ["CFLAGS", "CXXFLAGS", "FCFLAGS", "FFLAGS", "LDFLAGS", |
| 32 |
"ASFLAGS"]: |
| 33 |
@@ -1074,11 +1077,16 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 34 |
% (flags, self.settings[flags])) |
| 35 |
|
| 36 |
if "CBUILD" in self.settings: |
| 37 |
- 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") |
| 38 |
+ myf.write("# This should not be changed unless you know exactly" |
| 39 |
+ " what you are doing. You\n# should probably be " |
| 40 |
+ "using a different stage, instead.\n") |
| 41 |
myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n') |
| 42 |
|
| 43 |
if "CHOST" in self.settings: |
| 44 |
- 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") |
| 45 |
+ myf.write("# WARNING: Changing your CHOST is not something " |
| 46 |
+ "that should be done lightly.\n# Please consult " |
| 47 |
+ "https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable " |
| 48 |
+ "before changing.\n") |
| 49 |
myf.write('CHOST="'+self.settings["CHOST"]+'"\n') |
| 50 |
|
| 51 |
# Figure out what our USE vars are for building |
| 52 |
@@ -1090,7 +1098,9 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 53 |
myusevars.extend(self.settings["use"]) |
| 54 |
|
| 55 |
if myusevars: |
| 56 |
- 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") |
| 57 |
+ myf.write("# These are the USE and USE_EXPAND flags that were " |
| 58 |
+ "used for\n# building in addition to what is provided " |
| 59 |
+ "by the profile.\n") |
| 60 |
myusevars = sorted(set(myusevars)) |
| 61 |
myf.write('USE="' + ' '.join(myusevars) + '"\n') |
| 62 |
if '-*' in myusevars: |
Archives