1 |
This function is a lot of code that doesn't do a whole lot. |
2 |
It looks like a blind copy & paste & tweak from list_bashify. |
3 |
If the input is a string, it returns a copy of it (i.e. it's |
4 |
pretty much a nop). If it's a list, it runs ' '.join() on it. |
5 |
That's all. |
6 |
|
7 |
But let's not focus on the craziness of implementation. The |
8 |
few consumers of this function are already passing in strings |
9 |
in which case their use is pointless. Once we delete those |
10 |
callers, we can delete the implementation. |
11 |
--- |
12 |
catalyst/support.py | 13 ------------- |
13 |
catalyst/targets/stage1.py | 10 +++++----- |
14 |
catalyst/targets/stage2.py | 10 +++++----- |
15 |
3 files changed, 10 insertions(+), 23 deletions(-) |
16 |
|
17 |
diff --git a/catalyst/support.py b/catalyst/support.py |
18 |
index 62be63a..a26e49c 100644 |
19 |
--- a/catalyst/support.py |
20 |
+++ b/catalyst/support.py |
21 |
@@ -41,19 +41,6 @@ def list_bashify(mylist): |
22 |
return mypack |
23 |
|
24 |
|
25 |
-def list_to_string(mylist): |
26 |
- if type(mylist)==types.StringType: |
27 |
- mypack=[mylist] |
28 |
- else: |
29 |
- mypack=mylist[:] |
30 |
- for x in range(0,len(mypack)): |
31 |
- # surround args with quotes for passing to bash, |
32 |
- # allows things like "<" to remain intact |
33 |
- mypack[x]=mypack[x] |
34 |
- mypack = ' '.join(mypack) |
35 |
- return mypack |
36 |
- |
37 |
- |
38 |
class CatalystError(Exception): |
39 |
def __init__(self, message, print_traceback=False): |
40 |
if message: |
41 |
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py |
42 |
index d5cc298..b5dfac7 100644 |
43 |
--- a/catalyst/targets/stage1.py |
44 |
+++ b/catalyst/targets/stage1.py |
45 |
@@ -5,7 +5,7 @@ stage1 target |
46 |
|
47 |
import os |
48 |
|
49 |
-from catalyst.support import normpath, list_to_string |
50 |
+from catalyst.support import normpath |
51 |
from catalyst.fileops import ensure_dirs |
52 |
from catalyst.base.stagebase import StageBase |
53 |
|
54 |
@@ -38,19 +38,19 @@ class stage1(StageBase): |
55 |
|
56 |
def override_chost(self): |
57 |
if "chost" in self.settings: |
58 |
- self.settings["CHOST"]=list_to_string(self.settings["chost"]) |
59 |
+ self.settings["CHOST"] = self.settings["chost"] |
60 |
|
61 |
def override_cflags(self): |
62 |
if "cflags" in self.settings: |
63 |
- self.settings["CFLAGS"]=list_to_string(self.settings["cflags"]) |
64 |
+ self.settings["CFLAGS"] = self.settings["cflags"] |
65 |
|
66 |
def override_cxxflags(self): |
67 |
if "cxxflags" in self.settings: |
68 |
- self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"]) |
69 |
+ self.settings["CXXFLAGS"] = self.settings["cxxflags"] |
70 |
|
71 |
def override_ldflags(self): |
72 |
if "ldflags" in self.settings: |
73 |
- self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) |
74 |
+ self.settings["LDFLAGS"] = self.settings["ldflags"] |
75 |
|
76 |
def set_portage_overlay(self): |
77 |
StageBase.set_portage_overlay(self) |
78 |
diff --git a/catalyst/targets/stage2.py b/catalyst/targets/stage2.py |
79 |
index affa2cb..befe8bc 100644 |
80 |
--- a/catalyst/targets/stage2.py |
81 |
+++ b/catalyst/targets/stage2.py |
82 |
@@ -5,7 +5,7 @@ stage2 target, builds upon previous stage1 tarball |
83 |
|
84 |
import os |
85 |
|
86 |
-from catalyst.support import normpath, list_to_string |
87 |
+from catalyst.support import normpath |
88 |
from catalyst.base.stagebase import StageBase |
89 |
|
90 |
|
91 |
@@ -41,19 +41,19 @@ class stage2(StageBase): |
92 |
|
93 |
def override_chost(self): |
94 |
if "chost" in self.settings: |
95 |
- self.settings["CHOST"]=list_to_string(self.settings["chost"]) |
96 |
+ self.settings["CHOST"] = self.settings["chost"] |
97 |
|
98 |
def override_cflags(self): |
99 |
if "cflags" in self.settings: |
100 |
- self.settings["CFLAGS"]=list_to_string(self.settings["cflags"]) |
101 |
+ self.settings["CFLAGS"] = self.settings["cflags"] |
102 |
|
103 |
def override_cxxflags(self): |
104 |
if "cxxflags" in self.settings: |
105 |
- self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"]) |
106 |
+ self.settings["CXXFLAGS"] = self.settings["cxxflags"] |
107 |
|
108 |
def override_ldflags(self): |
109 |
if "ldflags" in self.settings: |
110 |
- self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) |
111 |
+ self.settings["LDFLAGS"] = self.settings["ldflags"] |
112 |
|
113 |
def set_portage_overlay(self): |
114 |
StageBase.set_portage_overlay(self) |
115 |
-- |
116 |
2.5.2 |