From: Ian Jackson Date: Sun, 8 Jul 2018 17:32:09 +0000 (+0100) Subject: Dgit.pm: Move debinatag_maintview from dgit X-Git-Tag: archive/debian/5.9~14 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=19309e667c41eb0a3149d1bdf7a1a20dc20dda2a;p=dgit.git Dgit.pm: Move debinatag_maintview from dgit git-debrebase is about to want this for convert-from-gbp dgit split brain fixup. Signed-off-by: Ian Jackson --- diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 066915b4..0e2464d6 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -42,6 +42,7 @@ BEGIN { @EXPORT = qw(setup_sigwarn forkcheck_setup forkcheck_mainprocess dep14_version_mangle debiantags debiantag_old debiantag_new + debiantag_maintview server_branch server_ref stat_exists link_ltarget hashfile @@ -209,6 +210,11 @@ sub debiantag_new ($$) { return "archive/$distro/".dep14_version_mangle $v; } +sub debiantag_maintview ($$) { + my ($v,$distro) = @_; + return "$distro/".dep14_version_mangle $v; +} + sub debiantags ($$) { my ($version,$distro) = @_; map { $_->($version, $distro) } (\&debiantag_new, \&debiantag_old); diff --git a/dgit b/dgit index 79e37672..357adc98 100755 --- a/dgit +++ b/dgit @@ -189,11 +189,6 @@ sub debiantag ($$) { return $tagformatfn->($v, $distro); } -sub debiantag_maintview ($$) { - my ($v,$distro) = @_; - return "$distro/".dep14_version_mangle $v; -} - sub madformat ($) { $_[0] eq '3.0 (quilt)' } sub lbranch () { return "$branchprefix/$csuite"; }