Merge ~ahasenack/ubuntu/+source/ocfs2-tools:cosmic-ocfs2-tools-merge-1.8.5-5 into ubuntu/+source/ocfs2-tools:debian/sid

[Andreas Hasenack]

Simple merge with debian.

This drops half our delta (1 out of 2). The other delta is a simple dep8 test fix, but one that was only needed in Ubuntu for some reason. In debian, the test are passing (https://ci.debian.net/packages/o/ocfs2-tools/unstable/amd64/), even in the 1.8.5-3 version where we had to introduce that delta. I felt uncomfortable submitting this change to them without a clear reason other than "it fails for us, please take the change even though it's working for you".

DEP8 tests: http://people.ubuntu.com/~ahasenack/dep8-ocfs2-tools-1.8.5-3ubuntu1/

PPA with test packages: https://launchpad.net/~ahasenack/+archive/ubuntu/ocfs2-tools-merge-1.8.5-5/+packages

I haven't used ocfs2-tools, and I was the previous uploader only because I fixed the FTBFS (that we can drop now), so my only confidence in this upload is that the dep8 tests passed, and that our delta is super simple.

[Christian Ehrhardt  (paelzer)]

Minimal delta is simple and as you explained Ubuntu (test env) specific.
I think you could still submit it to Debian, maybe they are willing to pick it still - better try than giving up prematurely.

If you are concerned about their reaction, put it in a an if based on lsb_release or so.
And add a comment what we have seen on the broken pipe.

The Debian changes since the last version are not huge but fine to be picked up.

Anyway, for the merge build and tests LGTM, also the Delta is fine IMHO - +1

review: Approve

[Christian Ehrhardt  (paelzer)]

>
> If you are concerned about their reaction, put it in a an if based on
> lsb_release or so.
> And add a comment what we have seen on the broken pipe.
>

I'd like it without the if even more, we might (correctly) say that
depending on the test env this can happen.
And while not triggering today for them it might at any point.
Therefore you are proactively fixing them, isn't that a nice contrib?

[Andreas Hasenack (ahasenack)]

I will do that then (push to debian).

For this merge, could you then please push the upload tag for me? I can then dput the package.

[Christian Ehrhardt  (paelzer)]

Tag pushed

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/ocfs2-tools
 * [new tag] upload/1.8.5-5ubuntu1 -> upload/1.8.5-5ubuntu1

[Andreas Hasenack (ahasenack)]

Uploaded, I'll follow migration.

[Andreas Hasenack (ahasenack)]

I filed https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905151

I tried to find autopkgtest logs from the old failure, but didn't find any. I then tried the tests again locally without our change (i.e., using "yes" instead of "echo yes"), and the tests passed. So I'm not even sure we still need it, but trying it out for real in a migration is a bit too painful right now.

[Christian Ehrhardt  (paelzer)]

>
> I tried to find autopkgtest logs from the old failure, but didn't find
> any. I then tried the tests again locally without our change (i.e., using
> "yes" instead of "echo yes"), and the tests passed. So I'm not even sure we
> still need it, but trying it out for real in a migration is a bit too
> painful right now.
>

You might upload the Debian version with "yes |" to a bileto ppa + tests.
Then you'll see if it now works on our test infrastructure as well.
OTOH - was the old issue permanent or flaky?

[Andreas Hasenack (ahasenack)]

Got a response from Debian saying they will include our change in the next package release, so the last remaining delta has its days numbered \o/

In parallel, I uploaded a ppa2 version to https://launchpad.net/~ahasenack/+archive/ubuntu/ocfs2-tools-merge-1.8.5-5 reverting our change, i.e., is uses "yes" instead of "echo yes". We could use that for a bileto run.

I don't remember if the old issue was permanent of flaky. I thought it had failed once, then we debugged and fixed it, but I can't find that failure in autopkgtest.ubuntu.com. Maybe it was only in a local test, before the upload.

[Andreas Hasenack (ahasenack)]

This migrated finally.

diff --git a/debian/changelog b/debian/changelog
index 621fcf8..12b321f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ocfs2-tools (1.8.5-5ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - use "echo yes |" instead of "yes |" to avoid a broken pipe error. The
+      "yes" command insists "too much"
+  * Drop:
+    - d/p/ftbfs-strings-header.patch: fix FTBFS (LP: #1740927)
+      [In Debian 1.8.5-4]
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 30 Jul 2018 17:13:16 -0300
+
 ocfs2-tools (1.8.5-5) unstable; urgency=medium
 
   * debian/patches: fix parallel build (Closes: #894630)
@@ -23,6 +34,16 @@ ocfs2-tools (1.8.5-4) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Wed, 24 Jan 2018 15:09:31 +0100
 
+ocfs2-tools (1.8.5-3ubuntu1) bionic; urgency=medium
+
+  * debian/patches/ftbfs-strings-header.patch: fsck.ocfs2: fix compile
+    error whith newer glibc.  Thanks to Gang He <[e-mail]>.
+    (LP: #1740927)
+  * debian/tests/basic: use "echo yes |" instead of "yes |" to avoid a broken
+    pipe error. The "yes" command insists "too much".
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 02 Jan 2018 17:46:42 -0200
+
 ocfs2-tools (1.8.5-3) unstable; urgency=medium
 
   * debian/control: drop B-D on dh-autoreconf and autotools-dev
diff --git a/debian/control b/debian/control
index f7c3119..d8c45db 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ocfs2-tools
 Section: admin
 Priority: optional
-Maintainer: Debian HA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HA Maintainers <[e-mail]>
 Uploaders: Valentin Vidic <[e-mail]>
 Standards-Version: 4.1.3
 Build-Depends: debhelper (>= 11), po-debconf, comerr-dev,
diff --git a/debian/tests/basic b/debian/tests/basic
index 3c11f7c..00196b7 100644
--- a/debian/tests/basic
+++ b/debian/tests/basic
@@ -19,7 +19,7 @@ echo "=== mkfs ==="
 mkfs.ocfs2 --force --mount local --block-size $(stat -f $DISK --format='%s') $DISK 2>&1
 
 echo "=== fsck ==="
-yes | fsck.ocfs2 -f -y -F $DISK 2>&1
+echo yes | fsck.ocfs2 -f -y -F $DISK 2>&1
 
 echo "=== debugfs ==="
 debugfs.ocfs2 -R stats $DISK