napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Count the files in the squashfs image without piping to wc -l.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-07-28 11:50:11 +02:00
parent cb2dcf7860
commit f44b8eb758
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/unsquashfs/main.py
View File

@ -59,10 +59,8 @@ class UnsquashOperation:
try: try:
for entry in self.unpacklist: for entry in self.unpacklist:
try: try:
unsqfsProcess = subprocess.Popen( [ "unsquashfs", "-l", entry[ "source" ] ], stdout = subprocess.PIPE ) sqfsList = subprocess.check_output( [ "unsquashfs", "-l", entry[ "source" ] ] )
wcProcess = subprocess.Popen( [ "wc", "-l" ], stdin = unsqfsProcess.stdout, stdout = subprocess.PIPE ) filesCount = sqfsList.splitlines().count()
countString = wcProcess.communicate()[ 0 ]
filesCount = int( float( countString ) )
self.unpackstatus[ entry[ "source" ] ][ 'total' ] = filesCount self.unpackstatus[ entry[ "source" ] ][ 'total' ] = filesCount
imgBaseName = os.path.splitext( os.path.basename( entry[ "source" ] ) )[ 0 ] imgBaseName = os.path.splitext( os.path.basename( entry[ "source" ] ) )[ 0 ]