isula-build: fix apply patch failing before compiling
Patch apply failed because in patch 0088, the pkgs sorting in daemon/load.go is not ordered by lexicographical, so patch 0102 apply failed. Signed-off-by: Lu Jingxiao <lujingxiao@huawei.com> (cherry picked from commit ab776685a6be7c92e852c148fedda206b3375d78)
This commit is contained in:
parent
57d824f19f
commit
c1efcf7410
@ -1 +1 @@
|
||||
0.9.5-24
|
||||
0.9.5-25
|
||||
|
||||
@ -1 +1 @@
|
||||
df4e990bc3b46523e9cc92d132d8948e50ef7979
|
||||
ccece5d21f168013a2a5b6e712d1837ecb9bde37
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: isula-build
|
||||
Version: 0.9.5
|
||||
Release: 24
|
||||
Release: 25
|
||||
Summary: A tool to build container images
|
||||
License: Mulan PSL V2
|
||||
URL: https://gitee.com/openeuler/isula-build
|
||||
@ -85,6 +85,12 @@ fi
|
||||
/usr/share/bash-completion/completions/isula-build
|
||||
|
||||
%changelog
|
||||
* Wed Jan 12 2022 Lu Jingxiao <lujingxiao@huawei.com> - 0.9.5-25
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:restart
|
||||
- DESC:fix apply patch failing before compiling
|
||||
|
||||
* Tue Jan 11 2022 jingxiaolu <lujingxiao@huawei.com> - 0.9.5-24
|
||||
- Type:enhancement
|
||||
- CVE:NA
|
||||
|
||||
@ -14,10 +14,10 @@ index 41690ab..b6d675b 100644
|
||||
--- a/daemon/load.go
|
||||
+++ b/daemon/load.go
|
||||
@@ -17,6 +17,8 @@ import (
|
||||
+ "context"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
+ "context"
|
||||
+ "strings"
|
||||
|
||||
"github.com/containers/image/v5/docker/tarfile"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user