mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-07-15 11:57:59 +00:00
Rediff patches
Drop : <REASON> Drop pborman-uuid.patch: <REASON> Drop kjk-lzma.patch: <REASON>
This commit is contained in:
@@ -1,9 +1,7 @@
|
||||
From: Shengjing Zhu <zhsj@debian.org>
|
||||
Date: Tue, 26 Mar 2019 15:49:40 +0800
|
||||
Subject: Fix UUID struct field not encoded in msgpack
|
||||
Description: golang-github-ugorji-go-codec-dev 1.1.1 takes the json field tag
|
||||
by default, thus the field which has `json:"-"` is ignored when
|
||||
marshal into msgpack.
|
||||
|
||||
Upstream uses the old codec library, so there's no problem.
|
||||
Bug-Debian: https://bugs.debian.org/923866
|
||||
Forwarded: no
|
||||
@@ -13,10 +11,10 @@ Forwarded: no
|
||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/deb/local.go b/deb/local.go
|
||||
index e9fa17c..fb3e404 100644
|
||||
index 229f6e1..5b8eb2a 100644
|
||||
--- a/deb/local.go
|
||||
+++ b/deb/local.go
|
||||
@@ -14,7 +14,7 @@ import (
|
||||
@@ -15,7 +15,7 @@ import (
|
||||
// LocalRepo is a collection of packages created locally
|
||||
type LocalRepo struct {
|
||||
// Permanent internal ID
|
||||
@@ -25,7 +23,7 @@ index e9fa17c..fb3e404 100644
|
||||
// User-assigned name
|
||||
Name string
|
||||
// Comment
|
||||
@@ -24,7 +24,7 @@ type LocalRepo struct {
|
||||
@@ -25,7 +25,7 @@ type LocalRepo struct {
|
||||
// DefaultComponent
|
||||
DefaultComponent string `codec:",omitempty"`
|
||||
// Uploaders configuration
|
||||
@@ -35,7 +33,7 @@ index e9fa17c..fb3e404 100644
|
||||
packageRefs *PackageRefList
|
||||
}
|
||||
diff --git a/deb/snapshot.go b/deb/snapshot.go
|
||||
index fc7689c..1aca3e3 100644
|
||||
index 307433a..aef19ae 100644
|
||||
--- a/deb/snapshot.go
|
||||
+++ b/deb/snapshot.go
|
||||
@@ -19,15 +19,15 @@ import (
|
||||
|
||||
Reference in New Issue
Block a user