From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Jul 2018 18:51:39 +0000 (+0100)
Subject: Dgit.pm: Move parsecontrol etc. out of dgit
X-Git-Tag: archive/debian/5.9~16
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=4d87a7d43579ecd11d31116e6e9dab4e6adb1af3

Dgit.pm: Move parsecontrol etc. out of dgit

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 5106f851..8f069f75 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -66,6 +66,8 @@ BEGIN {
                       $negate_harmful_gitattrs
 		      changedir git_slurp_config_src
 		      gdr_ffq_prev_branchinfo
+		      parsecontrolfh parsecontrol parsechangelog
+		      getfield
 		      playtree_setup);
     # implicitly uses $main::us
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO NOCOMMITCHECK)],
@@ -554,6 +556,59 @@ sub gdr_ffq_prev_branchinfo ($) {
     return ('branch', undef, $symref, $ffq_prev, $gdrlast);
 }
 
+sub parsecontrolfh ($$;$) {
+    my ($fh, $desc, $allowsigned) = @_;
+    our $dpkgcontrolhash_noissigned;
+    my $c;
+    for (;;) {
+	my %opts = ('name' => $desc);
+	$opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
+	$c = Dpkg::Control::Hash->new(%opts);
+	$c->parse($fh,$desc) or die "parsing of $desc failed";
+	last if $allowsigned;
+	last if $dpkgcontrolhash_noissigned;
+	my $issigned= $c->get_option('is_pgp_signed');
+	if (!defined $issigned) {
+	    $dpkgcontrolhash_noissigned= 1;
+	    seek $fh, 0,0 or die "seek $desc: $!";
+	} elsif ($issigned) {
+	    fail "control file $desc is (already) PGP-signed. ".
+		" Note that dgit push needs to modify the .dsc and then".
+		" do the signature itself";
+	} else {
+	    last;
+	}
+    }
+    return $c;
+}
+
+sub parsecontrol {
+    my ($file, $desc, $allowsigned) = @_;
+    my $fh = new IO::Handle;
+    open $fh, '<', $file or die "$file: $!";
+    my $c = parsecontrolfh($fh,$desc,$allowsigned);
+    $fh->error and die $!;
+    close $fh;
+    return $c;
+}
+
+sub parsechangelog {
+    my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
+    my $p = new IO::Handle;
+    my @cmd = (qw(dpkg-parsechangelog), @_);
+    open $p, '-|', @cmd or die $!;
+    $c->parse($p);
+    $?=0; $!=0; close $p or failedcmd @cmd;
+    return $c;
+}
+
+sub getfield ($$) {
+    my ($dctrl,$field) = @_;
+    my $v = $dctrl->{$field};
+    return $v if defined $v;
+    fail "missing field $field in ".$dctrl->get_option('name');
+}
+
 # ========== playground handling ==========
 
 # terminology:
diff --git a/dgit b/dgit
index ebd7f0af..c813a11f 100755
--- a/dgit
+++ b/dgit
@@ -962,59 +962,6 @@ sub access_giturl (;$) {
     return "$url/$package$suffix";
 }	       
 
-sub parsecontrolfh ($$;$) {
-    my ($fh, $desc, $allowsigned) = @_;
-    our $dpkgcontrolhash_noissigned;
-    my $c;
-    for (;;) {
-	my %opts = ('name' => $desc);
-	$opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
-	$c = Dpkg::Control::Hash->new(%opts);
-	$c->parse($fh,$desc) or die "parsing of $desc failed";
-	last if $allowsigned;
-	last if $dpkgcontrolhash_noissigned;
-	my $issigned= $c->get_option('is_pgp_signed');
-	if (!defined $issigned) {
-	    $dpkgcontrolhash_noissigned= 1;
-	    seek $fh, 0,0 or die "seek $desc: $!";
-	} elsif ($issigned) {
-	    fail "control file $desc is (already) PGP-signed. ".
-		" Note that dgit push needs to modify the .dsc and then".
-		" do the signature itself";
-	} else {
-	    last;
-	}
-    }
-    return $c;
-}
-
-sub parsecontrol {
-    my ($file, $desc, $allowsigned) = @_;
-    my $fh = new IO::Handle;
-    open $fh, '<', $file or die "$file: $!";
-    my $c = parsecontrolfh($fh,$desc,$allowsigned);
-    $fh->error and die $!;
-    close $fh;
-    return $c;
-}
-
-sub getfield ($$) {
-    my ($dctrl,$field) = @_;
-    my $v = $dctrl->{$field};
-    return $v if defined $v;
-    fail "missing field $field in ".$dctrl->get_option('name');
-}
-
-sub parsechangelog {
-    my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
-    my $p = new IO::Handle;
-    my @cmd = (qw(dpkg-parsechangelog), @_);
-    open $p, '-|', @cmd or die $!;
-    $c->parse($p);
-    $?=0; $!=0; close $p or failedcmd @cmd;
-    return $c;
-}
-
 sub commit_getclogp ($) {
     # Returns the parsed changelog hashref for a particular commit
     my ($objid) = @_;