Nir Soffer
2021-Nov-08 17:55 UTC
[Libguestfs] [PATCH libnbd] podwrapper.pl.in: Use short commit date
We can use git short commit date format $cs. Maybe it was not available
when podwrapper.pl was create.
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
podwrapper.pl.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/podwrapper.pl.in b/podwrapper.pl.in
index 9b39d7c..86ef452 100755
--- a/podwrapper.pl.in
+++ b/podwrapper.pl.in
@@ -233,8 +233,7 @@ my $date;
my $filename = "$abs_top_srcdir/.git";
if (!$date && -d $filename) {
local $ENV{GIT_DIR} = $filename;
- $_ = `git show -O/dev/null -s --format=%ci`;
- $date = $1 if /^(\d+-\d+-\d+)\s/;
+ $date = `git show -O/dev/null -s --format=%cs`;
}
if (!$date) {
my ($day, $month, $year) = (gmtime($ENV{SOURCE_DATE_EPOCH} ||
time))[3,4,5];
--
2.31.1
Richard W.M. Jones
2021-Nov-08 18:06 UTC
[Libguestfs] [PATCH libnbd] podwrapper.pl.in: Use short commit date
On Mon, Nov 08, 2021 at 07:55:51PM +0200, Nir Soffer wrote:> We can use git short commit date format $cs. Maybe it was not available > when podwrapper.pl was create. > > Signed-off-by: Nir Soffer <nsoffer at redhat.com> > --- > podwrapper.pl.in | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/podwrapper.pl.in b/podwrapper.pl.in > index 9b39d7c..86ef452 100755 > --- a/podwrapper.pl.in > +++ b/podwrapper.pl.in > @@ -233,8 +233,7 @@ my $date; > my $filename = "$abs_top_srcdir/.git"; > if (!$date && -d $filename) { > local $ENV{GIT_DIR} = $filename; > - $_ = `git show -O/dev/null -s --format=%ci`; > - $date = $1 if /^(\d+-\d+-\d+)\s/; > + $date = `git show -O/dev/null -s --format=%cs`; > } > if (!$date) { > my ($day, $month, $year) = (gmtime($ENV{SOURCE_DATE_EPOCH} || time))[3,4,5];This is fine. Same patch should go into nbdkit too. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://people.redhat.com/~rjones/virt-df/