This repository has been archived by the owner on May 20, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patches downloaded from cgit include cgit's version number, thus changing checksum on update. Push patch to svn to avoid source verification errors. git-svn-id: file:///srv/repos/svn-packages/svn@380391 eb2447ed-0c53-47e4-bac8-5bc4a241df78
- Loading branch information
eworm
authored and
svntogit
committed
Apr 15, 2020
1 parent
0e19f26
commit 4160e93
Showing
2 changed files
with
34 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From b9faf652735c603d1bdf849a570185eb721f11c1 Mon Sep 17 00:00:00 2001 | ||
From: Allan McRae <allan@archlinux.org> | ||
Date: Tue, 12 Nov 2019 16:14:57 +1000 | ||
Subject: pactest: set package tar format to GNU_FORMAT | ||
|
||
python-3.8 changed the default tar format to PAX_FORMAT. This caused | ||
issues in our testsuite with package extraction of files with UTF-8 | ||
characters as we run the tests under the C locale. | ||
|
||
sycn600.py: | ||
error: error while reading package /tmp/pactest-xuhri4xa/var/cache/pacman/pkg/unicodechars-2.0-1.pkg.tar.gz: Pathname can't be converted from UTF-8 to current locale. | ||
|
||
Set format back to GNU_FORMAT. | ||
|
||
Signed-off-by: Allan McRae <allan@archlinux.org> | ||
--- | ||
test/pacman/pmpkg.py | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py | ||
index 6a845222..e40868cc 100644 | ||
--- a/test/pacman/pmpkg.py | ||
+++ b/test/pacman/pmpkg.py | ||
@@ -142,7 +142,7 @@ class pmpkg(object): | ||
util.mkdir(os.path.dirname(self.path)) | ||
|
||
# Generate package metadata | ||
- tar = tarfile.open(self.path, "w:gz") | ||
+ tar = tarfile.open(self.path, "w:gz", format=tarfile.GNU_FORMAT) | ||
for name, data in archive_files: | ||
info = tarfile.TarInfo(name) | ||
info.size = len(data) |