Commit0ca61d4

authored and

committed

Fixed the gzip archive creation using python gzip module

(cherry picked from commit 160bd2bb74d88c110874c21635e24cc74ef58459)

1 parent5f23379 commit0ca61d4Copy full SHA for 0ca61d4

File tree

-1

lines changed

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`importos`
`8`	`8`	`importre`
	`9`	`+importgzip`
	`10`	`+importStringIO`
`9`	`11`	`fromerrorsimportInvalidGitRepositoryError,NoSuchPathError`
`10`	`12`	`fromutilsimporttouch,is_git_dir`
`11`	`13`	`fromcmdimportGit`
`@@ -386,7 +388,12 @@ def archive_tar_gz(self, treeish='master', prefix=None):`
`386`	`388`	`kwargs= {}`
`387`	`389`	`ifprefix:`
`388`	`390`	`kwargs['prefix']=prefix`
`389`		`-self.git.archive(treeish,"\| gzip",**kwargs)`
	`391`	`+resultstr=self.git.archive(treeish,**kwargs)`
	`392`	`+sio=StringIO.StringIO()`
	`393`	`+gf=gzip.GzipFile(fileobj=sio,mode='wb')`
	`394`	`+gf.write(resultstr)`
	`395`	`+gf.close()`
	`396`	`+returnsio.getvalue()`
`390`	`397`
`391`	`398`	`def_get_daemon_export(self):`
`392`	`399`	`filename=os.path.join(self.path,self.DAEMON_EXPORT_FILE)`

Comments

(0)