File tree Expand file tree Collapse file tree 2 files changed +4
-11
lines changed
Expand file tree Collapse file tree 2 files changed +4
-11
lines changed Original file line number Diff line number Diff line change 2222from manic .externals_status import check_safe_to_update_repos
2323from manic .sourcetree import SourceTree
2424from manic .utils import printlog
25- from manic .global_constants import PPRINTER , VERSION_SEPERATOR
25+ from manic .global_constants import VERSION_SEPERATOR
2626
2727if sys .hexversion < 0x02070000 :
2828 print (70 * '*' )
@@ -256,8 +256,6 @@ def main(args):
256256 root_dir = os .path .abspath (os .getcwd ())
257257 external_data = read_externals_description_file (root_dir , args .externals )
258258 external = create_externals_description (external_data )
259- if args .debug :
260- PPRINTER .pprint (external )
261259
262260 source_tree = SourceTree (root_dir , external )
263261 printlog ('Checking status of components: ' , end = '' )
@@ -274,7 +272,7 @@ def main(args):
274272 source_tree .verbose_status ()
275273 else :
276274 # checkout / update the external repositories.
277- safe_to_update = check_safe_to_update_repos (tree_status , args . debug )
275+ safe_to_update = check_safe_to_update_repos (tree_status )
278276 if not safe_to_update :
279277 # print status
280278 for comp in sorted (tree_status .keys ()):
Original file line number Diff line number Diff line change 99from __future__ import print_function
1010
1111from .global_constants import EMPTY_STR
12- from .utils import printlog
1312
1413
1514class ExternalStatus (object ):
@@ -109,7 +108,7 @@ def exists(self):
109108 return exists
110109
111110
112- def check_safe_to_update_repos (tree_status , debug ):
111+ def check_safe_to_update_repos (tree_status ):
113112 """Check if *ALL* repositories are in a safe state to update. We don't
114113 want to do a partial update of the repositories then die, leaving
115114 the model in an inconsistent state.
@@ -122,10 +121,6 @@ def check_safe_to_update_repos(tree_status, debug):
122121 safe_to_update = True
123122 for comp in tree_status :
124123 stat = tree_status [comp ]
125- if debug :
126- printlog ('{0} - {1} sync {2} clean {3}' .format (
127- comp , stat .safe_to_update (), stat .sync_state ,
128- stat .clean_state ))
129-
130124 safe_to_update &= stat .safe_to_update ()
125+
131126 return safe_to_update
You can’t perform that action at this time.
0 commit comments