Merge ~utkarsh/ubuntu/+source/at:lp1464051-at-focal into ubuntu/+source/at:ubuntu/focal-devel

[Utkarsh Gupta]

Hello,

This MP intends to fix LP: #1464051, by making at respecting seconds, which it didn't before.

The fix is trivial and should be easy to consider.
PPA at https://launchpad.net/~utkarsh/+archive/ubuntu/at

There were no tests but I've done a manual test and also ran the DEP8 tests which are now present in hirsute.

Requesting you to please review and sponsor the upload. Let me know if you have questions or suggestion.

[Christian Ehrhardt  (paelzer)]

Furthermore the SRU policy dictates that we'd also want to see a groovy upload for the same.
At least when sponsoring we'd want to do both at once.
Probably the very same change there ...
I didn't see an MP for it yet - is that in the working?

Other than this and Sergios comment this LGTM already.

Will be interesting to see the SRU dicsussion on behavior change on this one ...

+1 under the condition to have the other two things sorted out.

review: Approve

[Utkarsh Gupta (utkarsh)]

Sergio's suggestion incorporated.
Groovy MP up at https://code.launchpad.net/~utkarsh/ubuntu/+source/at/+git/at/+merge/400019.

Good to go from my end, please re-review and sponsor. TIA! \o/

[Bryce Harrington (bryce)]

Since I reviewed/sponsored the groovy package, I went ahead and sponsored this one too so they'll both be in place for SRU review.

$ git push pkg upload/3.1.23-1ubuntu1.1
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 12 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (11/11), 1.90 KiB | 176.00 KiB/s, done.
Total 11 (delta 5), reused 1 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/at
 * [new tag] upload/3.1.23-1ubuntu1.1 -> upload/3.1.23-1ubuntu1.1

$ dput ubuntu at_3.1.23-1ubuntu1.1_source.changes
Checking signature on .changes
gpg: /home/bryce/pkg/At/review-mp400019/focal/at_3.1.23-1ubuntu1.1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/pkg/At/review-mp400019/focal/at_3.1.23-1ubuntu1.1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading at_3.1.23-1ubuntu1.1.dsc: done.
  Uploading at_3.1.23-1ubuntu1.1.debian.tar.xz: done.
  Uploading at_3.1.23-1ubuntu1.1_source.buildinfo: done.
  Uploading at_3.1.23-1ubuntu1.1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

Per discussion int he bug this was rejected

Unmerged commits

7536eea... by Utkarsh Gupta on 2021-03-22

changelog

Signed-off-by: Utkarsh Gupta <email address hidden>

021f5ed... by Utkarsh Gupta on 2020-12-15

d/patches: add 03-do-not-drop-seconds.patch (cherry-pick).

When calculating time for the job, do not drop seconds.

LP: #1464051
Gbp-Dch: full

diff --git a/debian/changelog b/debian/changelog
index d64e8c5..1b6277d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+at (3.1.23-1ubuntu1.1) focal; urgency=medium
+
+  * d/patches: add 03-do-not-drop-seconds.patch (cherry-pick).
+    When calculating time for the job, do not drop seconds.
+    (LP: #1464051)
+
+ -- Utkarsh Gupta <[e-mail]>  Mon, 22 Mar 2021 19:49:48 +0530
+
 at (3.1.23-1ubuntu1) disco; urgency=medium
 
   * Merge with Debian unstable (LP: #1802914). Remaining changes:
diff --git a/debian/patches/03-do-not-drop-seconds.patch b/debian/patches/03-do-not-drop-seconds.patch
new file mode 100644
index 0000000..4aede80
--- /dev/null
+++ b/debian/patches/03-do-not-drop-seconds.patch
@@ -0,0 +1,28 @@
+From 15ee22de9dfd67d9c97404302623a9d45ce887a2 Mon Sep 17 00:00:00 2001
+From: Jose M Calhariz <[e-mail]>
+Date: Wed, 17 Jul 2019 02:18:15 +0100
+Subject: [PATCH] when calculating time for the job, do not drop seconds
+Origin: upstream, https://salsa.debian.org/debian/at/-/commit/15ee22de9dfd67d9c97404302623a9d45ce887a2
+Bug-Debian: https://bugs.debian.org/792040
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/at/+bug/1464051
+
+---
+ at.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/at.c b/at.c
+index 2136e0b..48884ec 100644
+--- a/at.c
++++ b/at.c
+@@ -860,8 +860,6 @@ main(int argc, char **argv)
+ 		fprintf(stderr, "invalid date format: %s\n", optarg);
+ 		exit(EXIT_FAILURE);
+ 	    }
+-	    /* drop seconds */
+-	    timer -= timer % 60;
+ 	    break;
+ 
+ 	default:
+-- 
+GitLab
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..1dacf3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+03-do-not-drop-seconds.patch