Run of fresh-snapshots for golang-github-prometheus-procfs

Merge these changes:

Summary

Merged new upstream version: 0.8.0+git20220902.1.aa41d1a+ds (was: 0.8.0).

Diff

Branch: main

diff --git a/debian/changelog b/debian/changelog
index b3f21ce..7c9b529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang-github-prometheus-procfs (0.8.0+git20220902.1.aa41d1a+ds-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 07 Sep 2022 03:17:57 -0000
+
 golang-github-prometheus-procfs (0.8.0-3) unstable; urgency=medium
 
   * Patch actual testdata so as not to overflow ints on 32-bit archs
diff --git a/debian/patches/01-fix-testdata-paths.patch b/debian/patches/01-fix-testdata-paths.patch
index f8fb526..1d719a6 100644
--- a/debian/patches/01-fix-testdata-paths.patch
+++ b/debian/patches/01-fix-testdata-paths.patch
@@ -4,8 +4,10 @@ Description: Make path to testdata fixtures relative again
  that package, we need to adjust the paths.
 Author: Daniel Swarbrick <dswarbrick@debian.org>
 Forwarded: not-needed
---- a/bcache/get_test.go
-+++ b/bcache/get_test.go
+Index: golang-github-prometheus-procfs/bcache/get_test.go
+===================================================================
+--- golang-github-prometheus-procfs.orig/bcache/get_test.go
++++ golang-github-prometheus-procfs/bcache/get_test.go
 @@ -19,7 +19,7 @@ import (
  )
  
@@ -15,8 +17,10 @@ Forwarded: not-needed
  	if err != nil {
  		t.Fatalf("failed to access bcache fs: %v", err)
  	}
---- a/blockdevice/stats_test.go
-+++ b/blockdevice/stats_test.go
+Index: golang-github-prometheus-procfs/blockdevice/stats_test.go
+===================================================================
+--- golang-github-prometheus-procfs.orig/blockdevice/stats_test.go
++++ golang-github-prometheus-procfs/blockdevice/stats_test.go
 @@ -21,8 +21,8 @@ import (
  
  const (
@@ -55,8 +59,10 @@ Forwarded: not-needed
  	if err != nil {
  		t.Fatalf("failed to access blockdevice fs: %v", err)
  	}
---- a/btrfs/get_test.go
-+++ b/btrfs/get_test.go
+Index: golang-github-prometheus-procfs/btrfs/get_test.go
+===================================================================
+--- golang-github-prometheus-procfs.orig/btrfs/get_test.go
++++ golang-github-prometheus-procfs/btrfs/get_test.go
 @@ -28,7 +28,7 @@ type alloc struct {
  }
  
@@ -66,8 +72,10 @@ Forwarded: not-needed
  	if err != nil {
  		t.Fatalf("failed to access Btrfs filesystem: %v", err)
  	}
---- a/iscsi/get_test.go
-+++ b/iscsi/get_test.go
+Index: golang-github-prometheus-procfs/iscsi/get_test.go
+===================================================================
+--- golang-github-prometheus-procfs.orig/iscsi/get_test.go
++++ golang-github-prometheus-procfs/iscsi/get_test.go
 @@ -30,12 +30,12 @@ func TestGetStats(t *testing.T) {
  				Tpgt: []iscsi.TPGT{
  					{
@@ -173,8 +181,10 @@ Forwarded: not-needed
  	if err != nil {
  		t.Fatalf("failed to access xfs fs: %v", err)
  	}
---- a/sysfs/fs_test.go
-+++ b/sysfs/fs_test.go
+Index: golang-github-prometheus-procfs/sysfs/fs_test.go
+===================================================================
+--- golang-github-prometheus-procfs.orig/sysfs/fs_test.go
++++ golang-github-prometheus-procfs/sysfs/fs_test.go
 @@ -19,7 +19,7 @@ package sysfs
  import "testing"
  
@@ -184,8 +194,10 @@ Forwarded: not-needed
  )
  
  func TestNewFS(t *testing.T) {
---- a/xfs/parse_test.go
-+++ b/xfs/parse_test.go
+Index: golang-github-prometheus-procfs/xfs/parse_test.go
+===================================================================
+--- golang-github-prometheus-procfs.orig/xfs/parse_test.go
++++ golang-github-prometheus-procfs/xfs/parse_test.go
 @@ -731,7 +731,7 @@ func TestParseStats(t *testing.T) {
  			stats, err = xfs.ParseStats(strings.NewReader(tt.s))
  		}
@@ -195,8 +207,10 @@ Forwarded: not-needed
  			if err != nil {
  				t.Fatalf("failed to access xfs fs: %v", err)
  			}
---- a/xfs/xfs_test.go
-+++ b/xfs/xfs_test.go
+Index: golang-github-prometheus-procfs/xfs/xfs_test.go
+===================================================================
+--- golang-github-prometheus-procfs.orig/xfs/xfs_test.go
++++ golang-github-prometheus-procfs/xfs/xfs_test.go
 @@ -21,7 +21,7 @@ import (
  )
  
@@ -215,8 +229,10 @@ Forwarded: not-needed
  	if err != nil {
  		t.Fatalf("failed to access xfs fs: %v", err)
  	}
---- a/internal/fs/fs_test.go
-+++ b/internal/fs/fs_test.go
+Index: golang-github-prometheus-procfs/internal/fs/fs_test.go
+===================================================================
+--- golang-github-prometheus-procfs.orig/internal/fs/fs_test.go
++++ golang-github-prometheus-procfs/internal/fs/fs_test.go
 @@ -16,7 +16,7 @@ package fs
  import "testing"
  
diff --git a/debian/patches/02-proc-stat-test-int64.patch b/debian/patches/02-proc-stat-test-int64.patch
index 0d4b42a..b3cb2b1 100644
--- a/debian/patches/02-proc-stat-test-int64.patch
+++ b/debian/patches/02-proc-stat-test-int64.patch
@@ -3,8 +3,10 @@ Description: Reduce the magnitude of test data to fit within 32-bit ints
  test data will overflow these on 32-bit archs.
 Author: Daniel Swarbrick <dswarbrick@debian.org>
 Bug: https://github.com/prometheus/procfs/pull/404/files#r963162202
---- a/proc_stat_test.go
-+++ b/proc_stat_test.go
+Index: golang-github-prometheus-procfs/proc_stat_test.go
+===================================================================
+--- golang-github-prometheus-procfs.orig/proc_stat_test.go
++++ golang-github-prometheus-procfs/proc_stat_test.go
 @@ -94,8 +94,8 @@ func TestProcStatLimits(t *testing.T) {
  		want int
  		have int
@@ -16,8 +18,10 @@ Bug: https://github.com/prometheus/procfs/pull/404/files#r963162202
  	} {
  		if test.want != test.have {
  			t.Errorf("want %s %d, have %d", test.name, test.want, test.have)
---- a/testdata/fixtures.ttar
-+++ b/testdata/fixtures.ttar
+Index: golang-github-prometheus-procfs/testdata/fixtures.ttar
+===================================================================
+--- golang-github-prometheus-procfs.orig/testdata/fixtures.ttar
++++ golang-github-prometheus-procfs/testdata/fixtures.ttar
 @@ -709,7 +709,7 @@ SymlinkTo: /does/not/exist
  # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  Path: fixtures/proc/26232/stat
diff --git a/proc_cgroup.go b/proc_cgroup.go
index cca0332..ea83a75 100644
--- a/proc_cgroup.go
+++ b/proc_cgroup.go
@@ -23,7 +23,7 @@ import (
 	"github.com/prometheus/procfs/internal/util"
 )
 
-// Cgroup models one line from /proc/[pid]/cgroup. Each Cgroup struct describes the the placement of a PID inside a
+// Cgroup models one line from /proc/[pid]/cgroup. Each Cgroup struct describes the placement of a PID inside a
 // specific control hierarchy. The kernel has two cgroup APIs, v1 and v2. v1 has one hierarchy per available resource
 // controller, while v2 has one unified hierarchy shared by all controllers. Regardless of v1 or v2, all hierarchies
 // contain all running processes, so the question answerable with a Cgroup struct is 'where is this process in

Branch: upstream

Tag: upstream/0.8.0+git20220902.1.aa41d1a+ds
diff --git a/proc_cgroup.go b/proc_cgroup.go
index cca0332..ea83a75 100644
--- a/proc_cgroup.go
+++ b/proc_cgroup.go
@@ -23,7 +23,7 @@ import (
 	"github.com/prometheus/procfs/internal/util"
 )
 
-// Cgroup models one line from /proc/[pid]/cgroup. Each Cgroup struct describes the the placement of a PID inside a
+// Cgroup models one line from /proc/[pid]/cgroup. Each Cgroup struct describes the placement of a PID inside a
 // specific control hierarchy. The kernel has two cgroup APIs, v1 and v2. v1 has one hierarchy per available resource
 // controller, while v2 has one unified hierarchy shared by all controllers. Regardless of v1 or v2, all hierarchies
 // contain all running processes, so the question answerable with a Cgroup struct is 'where is this process in

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☒ merge proposals for the package maintainer are currently being rate-limited (open: 1253, max open: 300)
  • ☑ change set 0e60f37f-a14d-46d9-97f1-bd5d67170b2e is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots golang-github-prometheus-procfs-devapt install -t fresh-snapshots golang-procfs-dev

Lintian Result

Full worker log Full build log