[elbe-devel] [PATCH 10/10] Revert "finetuning convert mv, cp to glob"
Torben Hohn
torben.hohn at linutronix.de
Wed Mar 22 17:44:17 CET 2017
This reverts commit fd402c070bd98b1cb79875752fc37c51b3aa2648.
glob () is returning a list, which cant be added to str
---
elbepack/finetuning.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/elbepack/finetuning.py b/elbepack/finetuning.py
index 83a9e41..dbb1cf6 100644
--- a/elbepack/finetuning.py
+++ b/elbepack/finetuning.py
@@ -114,9 +114,7 @@ class CpAction(FinetuningAction):
FinetuningAction.__init__(self, node)
def execute(self, log, buildenv, target):
- dest = target.glob( self.node.et.text )
- src = target.glob ( self.node.et.attrib['path'] )
- log.do( "cp -av " + src + " " + dest)
+ log.do( "cp -av " + target.fname( self.node.et.attrib['path'] ) + " " + target.fname( self.node.et.text ) )
FinetuningAction.register( CpAction )
@@ -181,9 +179,7 @@ class MvAction(FinetuningAction):
FinetuningAction.__init__(self, node)
def execute(self, log, buildenv, target):
- dest = target.glob( self.node.et.text )
- src = target.glob ( self.node.et.attrib['path'] )
- log.do( "mv -v " + src + " " + dest )
+ log.do( "mv -v " + target.fname( self.node.et.attrib['path'] ) + " " + target.fname( self.node.et.text ) )
FinetuningAction.register( MvAction )
--
2.1.4
More information about the elbe-devel
mailing list