Merge pull request #6131 from kmuriki/r3.8.1

R3.8.1

Author: kmuriki

CHANGELOG.md

@@ -12,6 +12,7 @@
   - Fix incorrect reference in sandbox restrictive permissions warning.
   - Prevent garbage collection from closing the container image file
     descriptor.
+  - Update to Arch Linux pacman.conf URL and remove file size verification.
 
 ## v3.8.0 - [2021-06-15]
 

CONTRIBUTORS.md

@@ -16,6 +16,7 @@
     - Amanda Duffy <[email protected]>
     - Ana Guerrero Lopez <[email protected]>
     - Ángel Bejarano <[email protected]>
+    - Apuã Paquola <[email protected]>
     - Aron Öfjörð Jóhannesson <[email protected]>
     - Bernard Li <[email protected]>
     - Brian Bockelman <[email protected]>

internal/pkg/build/sources/conveyorPacker_arch.go

@@ -22,7 +22,7 @@ import (
 )
 
 const (
-	pacmanConfURL = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/pacman.conf?h=packages/pacman"
+	pacmanConfURL = "https://github.com/archlinux/svntogit-packages/raw/master/pacman/trunk/pacman.conf"
 )
 
 var (
@@ -126,16 +126,11 @@ func (cp *ArchConveyorPacker) getPacConf(pacmanConfURL string) (pacConf string,
 	}
 	defer resp.Body.Close()
 
-	bytesWritten, err := io.Copy(pacConfFile, resp.Body)
+	_, err = io.Copy(pacConfFile, resp.Body)
 	if err != nil {
 		return
 	}
 
-	//Simple check to make sure file received is the correct size
-	if bytesWritten != resp.ContentLength {
-		return "", fmt.Errorf("file received is not the right size. supposed to be: %v actually: %v", resp.ContentLength, bytesWritten)
-	}
-
 	return pacConfFile.Name(), nil
 }