Rediff patches

Drop : <REASON>
Drop pborman-uuid.patch: <REASON>
Drop kjk-lzma.patch: <REASON>
This commit is contained in:
Sébastien Delafond
2019-12-22 14:59:33 +01:00
parent 5719d6fcdd
commit 199b5ab9b8
5 changed files with 8 additions and 98 deletions
@@ -11,10 +11,10 @@ Forwarded: https://github.com/aptly-dev/aptly/pull/830
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/deb/remote.go b/deb/remote.go
index 167d45f..71eb984 100644
index 72165ba..316636d 100644
--- a/deb/remote.go
+++ b/deb/remote.go
@@ -600,7 +600,8 @@ func (repo *RemoteRepo) Decode(input []byte) error {
@@ -662,7 +662,8 @@ func (repo *RemoteRepo) Decode(input []byte) error {
decoder := codec.NewDecoderBytes(input, &codec.MsgpackHandle{})
err := decoder.Decode(repo)
if err != nil {
@@ -25,7 +25,7 @@ index 167d45f..71eb984 100644
var repo11 struct { // nolint: maligned
UUID string
diff --git a/deb/snapshot.go b/deb/snapshot.go
index fc7689c..feef44a 100644
index aef19ae..cefe82e 100644
--- a/deb/snapshot.go
+++ b/deb/snapshot.go
@@ -140,7 +140,8 @@ func (s *Snapshot) Decode(input []byte) error {