[debhelper-devel] [Git][debian/debhelper][master] Move sub from dh to D::DH::SequencerUtil

[Niels Thykier]

Niels Thykier pushed to branch master at Debian / debhelper


Commits:
30ea2c14 by Niels Thykier at 2018-03-07T19:44:57+00:00
Move sub from dh to D::DH::SequencerUtil

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


2 changed files:

- dh
- lib/Debian/Debhelper/SequencerUtil.pm


Changes:

=====================================
dh
=====================================
--- a/dh
+++ b/dh
@@ -1047,23 +1047,6 @@ sub can_skip {
 	return 1;
 }
 
-sub extract_skipinfo {
-	my ($command) = @_;
-
-	foreach my $dir (split (':', $ENV{PATH})) {
-		if (open (my $h, "<", "$dir/$command")) {
-			while (<$h>) {
-				if (m/PROMISE: DH NOOP( WITHOUT\s+(.*))?\s*$/) {
-					close $h;
-					return split(' ', $2) if defined($2);
-					return ('always-skip');
-				}
-			}
-			close $h;
-			return ();
-		}
-	}
-}
 
 =head1 SEE ALSO
 


=====================================
lib/Debian/Debhelper/SequencerUtil.pm
=====================================
--- a/lib/Debian/Debhelper/SequencerUtil.pm
+++ b/lib/Debian/Debhelper/SequencerUtil.pm
@@ -14,6 +14,7 @@ our @EXPORT = qw(
 	to_rules_target
 	unpack_sequence
 	rules_explicit_target
+	extract_skipinfo
 	DUMMY_TARGET
 );
 
@@ -128,4 +129,24 @@ sub rules_explicit_target {
 	return $EXPLICIT_TARGETS{$target};
 }
 
+sub extract_skipinfo {
+	my ($command) = @_;
+
+	foreach my $dir (split(':', $ENV{PATH})) {
+		if (open (my $h, "<", "$dir/$command")) {
+			while (<$h>) {
+				if (m/PROMISE: DH NOOP( WITHOUT\s+(.*))?\s*$/) {
+					close $h;
+					return split(' ', $2) if defined($2);
+					return ('always-skip');
+				}
+			}
+			close $h;
+			return;
+		}
+	}
+	return;
+}
+
+
 1;



View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/30ea2c148eb780c3bdbc2269348794c2ef27b80a

---
View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/30ea2c148eb780c3bdbc2269348794c2ef27b80a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debhelper-devel/attachments/20180307/ae926e59/attachment-0001.html>