Skip to content

Commit e9899d9

Browse files
committed
Fix accidental append if file already exist
1 parent cffa279 commit e9899d9

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

pkg/appstore/appstore_download.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func (t *appstore) downloadFile(src, dst string, progress *progressbar.ProgressB
126126
}
127127
defer res.Body.Close()
128128

129-
file, err := t.os.OpenFile(dst, os.O_CREATE|os.O_WRONLY, 0644)
129+
file, err := t.os.OpenFile(dst, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
130130
if err != nil {
131131
return fmt.Errorf("failed to open file: %w", err)
132132
}
@@ -237,7 +237,7 @@ func (t *appstore) applyPatches(item downloadItemResult, acc Account, src, dst s
237237
}
238238
defer srcZip.Close()
239239

240-
dstFile, err := t.os.OpenFile(dst, os.O_CREATE|os.O_WRONLY, 0644)
240+
dstFile, err := t.os.OpenFile(dst, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
241241
if err != nil {
242242
return fmt.Errorf("failed to open file: %w", err)
243243
}

pkg/appstore/appstore_download_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ var _ = Describe("AppStore (Download)", func() {
388388

389389
BeforeEach(func() {
390390
var err error
391-
tmpFile, err = os.OpenFile(fmt.Sprintf("%s.tmp", testFile.Name()), os.O_CREATE|os.O_WRONLY, 0644)
391+
tmpFile, err = os.OpenFile(fmt.Sprintf("%s.tmp", testFile.Name()), os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
392392
Expect(err).ToNot(HaveOccurred())
393393

394394
outputPath = strings.TrimSuffix(tmpFile.Name(), ".tmp")

pkg/appstore/appstore_replicate_sinf.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ type ReplicateSinfInput struct {
2727
func (t *appstore) ReplicateSinf(input ReplicateSinfInput) error {
2828
zipReader, err := zip.OpenReader(input.PackagePath)
2929
if err != nil {
30-
return errors.New("failed to open zip reader")
30+
return fmt.Errorf("failed to open zip reader: %w", err)
3131
}
3232

3333
tmpPath := fmt.Sprintf("%s.tmp", input.PackagePath)
34-
tmpFile, err := t.os.OpenFile(tmpPath, os.O_CREATE|os.O_WRONLY, 0644)
34+
tmpFile, err := t.os.OpenFile(tmpPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
3535

3636
if err != nil {
3737
return fmt.Errorf("failed to open file: %w", err)

0 commit comments

Comments
 (0)