Merge ~utkarsh/ubuntu/+source/at:lp1464051-at-groovy into ubuntu/+source/at:ubuntu/groovy-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.

[Bryce Harrington (bryce)]

Looks straightforward enough, and same changes as already reviewed by Christian and Sergio.
+1 LGTM.

I'll sponsor both this and the focal MP for you, directly.

review: Approve

[Bryce Harrington (bryce)]

Tagged and uploaded

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

[Utkarsh Gupta (utkarsh)]

Thanks, Bryce! \o/

Though it looks like you've either forgot to push the tags or forgot to paste that part;
cf: git push pkg upload/3.1.23-1ubuntu2.1

In case you haven't, please do. If you have and forgot to paste that part, please ignore this. Thanks, again!

[Bryce Harrington (bryce)]

On Tue, Mar 23, 2021 at 06:19:29PM -0000, Utkarsh Gupta wrote:
> Thanks, Bryce! \o/
>
> Though it looks like you've either forgot to push the tags or forgot to paste that part;
> cf: git push pkg upload/3.1.23-1ubuntu2.1
>
> In case you haven't, please do. If you have and forgot to paste that part, please ignore this. Thanks, again!

I did push it, the scrollback in my buffer was a bit messy (due to tab
completion conflict with the focal upload tag) so I didn't bother
pasting it.

[Utkarsh Gupta (utkarsh)]

Awesome, thank you for the explanation!

[Christian Ehrhardt  (paelzer)]

Per discussion int he bug this was rejected

Unmerged commits

2a28dec... by Utkarsh Gupta on 2021-03-23

changelog

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

b2e351a... 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 921f2a5..36f46ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+at (3.1.23-1ubuntu2.1) groovy; 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]>  Tue, 23 Mar 2021 14:29:48 +0530
+
 at (3.1.23-1ubuntu2) groovy; urgency=medium
 
   * No change rebuild against new cet ABI.
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