mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-06-16 07:10:54 +00:00
Refresh patches (and remove not relevant patches)
This commit is contained in:
+10
-10
@@ -10,11 +10,11 @@ Forwarded: https://github.com/aptly-dev/aptly/pull/830
|
||||
deb/snapshot.go | 3 ++-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/deb/remote.go b/deb/remote.go
|
||||
index 72165ba..316636d 100644
|
||||
--- a/deb/remote.go
|
||||
+++ b/deb/remote.go
|
||||
@@ -662,7 +662,8 @@ func (repo *RemoteRepo) Decode(input []byte) error {
|
||||
Index: aptly/deb/remote.go
|
||||
===================================================================
|
||||
--- aptly.orig/deb/remote.go
|
||||
+++ aptly/deb/remote.go
|
||||
@@ -688,7 +688,8 @@ func (repo *RemoteRepo) Decode(input []b
|
||||
decoder := codec.NewDecoderBytes(input, &codec.MsgpackHandle{})
|
||||
err := decoder.Decode(repo)
|
||||
if err != nil {
|
||||
@@ -24,11 +24,11 @@ index 72165ba..316636d 100644
|
||||
// probably it is broken DB from go < 1.2, try decoding w/o time.Time
|
||||
var repo11 struct { // nolint: maligned
|
||||
UUID string
|
||||
diff --git a/deb/snapshot.go b/deb/snapshot.go
|
||||
index aef19ae..cefe82e 100644
|
||||
--- a/deb/snapshot.go
|
||||
+++ b/deb/snapshot.go
|
||||
@@ -140,7 +140,8 @@ func (s *Snapshot) Decode(input []byte) error {
|
||||
Index: aptly/deb/snapshot.go
|
||||
===================================================================
|
||||
--- aptly.orig/deb/snapshot.go
|
||||
+++ aptly/deb/snapshot.go
|
||||
@@ -152,7 +152,8 @@ func (s *Snapshot) Decode(input []byte)
|
||||
decoder := codec.NewDecoderBytes(input, &codec.MsgpackHandle{})
|
||||
err := decoder.Decode(s)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user