mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-06-12 06:30:35 +00:00
Fix file truncation bug
This commix prevents files from being truncated when attempting to add a hard-linked package which already exists inside the pool directory.
This commit is contained in:
+10
-6
@@ -128,12 +128,16 @@ func (pool *PackagePool) Import(path string, hashMD5 string) error {
|
|||||||
// unable to stat target location?
|
// unable to stat target location?
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// file doesn't exist, that's ok
|
}
|
||||||
} else {
|
|
||||||
if targetInfo.Size() != sourceInfo.Size() {
|
if targetInfo.Size() != sourceInfo.Size() {
|
||||||
// trying to overwrite file?
|
// trying to overwrite file?
|
||||||
return fmt.Errorf("unable to import into pool: file %s already exists", poolPath)
|
return fmt.Errorf("unable to import into pool: file %s already exists", poolPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if os.SameFile(targetInfo, sourceInfo) {
|
||||||
|
// Same file on the filesystem? Just skip it.
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// create subdirs as necessary
|
// create subdirs as necessary
|
||||||
|
|||||||
Reference in New Issue
Block a user