[pve-devel] [PATCH manager 2/6] cleanup: replace repoid.pl script by simple git commands

Thomas Lamprecht t.lamprecht at proxmox.com
Wed Jun 20 12:46:59 CEST 2018


Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 Makefile  |  3 ++-
 repoid.pl | 40 ----------------------------------------
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100755 repoid.pl

diff --git a/Makefile b/Makefile
index 433b6069..0904db07 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,8 @@ $(DEB):
 
 .PHONY: upload
 upload: ${DEB} check
-	./repoid.pl .git check
+	# check if working directory is clean
+	git diff --exit-code --stat && git diff --exit-code --stat --staged
 	tar cf - ${DEB} | ssh -X repoman at repo.proxmox.com upload --product pve --dist stretch
 
 .PHONY: install
diff --git a/repoid.pl b/repoid.pl
deleted file mode 100755
index 5120ef8b..00000000
--- a/repoid.pl
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/perl -w
-
-# use use the first 8 characters from the master commit ID
-
-# git status --porcelain
-
-use strict;
-use lib qw(.);
-use PVE::Tools qw(run_command);
-
-my $gitdir = shift;
-die "no repository" if !$gitdir;
-
-my $path = "$gitdir/refs/heads/master";
-die "master branch does not exists" if ! -f $path;
-
-my $arg1 = shift;
-
-if ($arg1) {
-    die "unknown parameter '$arg1'" if $arg1 ne 'check';
-
-    my $testfunc = sub {
-	my $line = shift;
-	return if $line =~ m/^#/;
-	return if $line =~ m/^\?\?/;
-
-	die "detected modified content: $line\n";
-    };
-
-    my $cmd = ['git', '--git-dir', $gitdir ,'status', '--porcelain'];
-    run_command($cmd, outfunc => $testfunc);
-}
-
-my $repoid = `cat $path`;
-chomp $repoid;
-
-die "invalid commit format" if $repoid !~ m/^[0-9a-f]{40}$/;
-
-my $res = substr $repoid, 0, 8;
-print "$res\n";
-- 
2.17.1




More information about the pve-devel mailing list