summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2014-12-21 19:57:56 +0300
committerIgor Pashev <pashev.igor@gmail.com>2014-12-21 19:57:56 +0300
commit5745d8df0f15109ba8c85d551f1cde7619497a03 (patch)
tree6d8789fc6462d4ccd395ab59de472810981786fd
parentff0b6158d55e6254ae368d1f92c32449f8d3ef1d (diff)
downloaddh-smf-5745d8df0f15109ba8c85d551f1cde7619497a03.tar.gz
dh-smf (6) unstable; urgency=mediumHEADdyson/6master
* Fixed code for skipping milestones.
-rw-r--r--debian/changelog6
-rwxr-xr-xdh_smf11
2 files changed, 11 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 4df421e..8789249 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dh-smf (6) unstable; urgency=medium
+
+ * Fixed code for skipping milestones.
+
+ -- Igor Pashev <pashev.igor@gmail.com> Sun, 21 Dec 2014 19:50:45 +0300
+
dh-smf (5) unstable; urgency=medium
* Support multiple services in a single manifest (after CUPS)
diff --git a/dh_smf b/dh_smf
index 4ecacad..b67d042 100755
--- a/dh_smf
+++ b/dh_smf
@@ -185,15 +185,14 @@ foreach my $package ( @{ $dh{DOPACKAGES} } ) {
],
);
while ( my ( $svc, $attrs ) = each %{ $xml->{'service'} } ) {
- push @services, mkservices( $svc, $attrs );
+ push @services, mkservices( $svc, $attrs )
+ unless $svc =~ /milestone\//;
}
}
-# Ignore milestones and dummy services. A milestone is usually a dummy service as well
- @services = grep {
- $_->{'name'} !~ /milestone\//
- && $_->{'exec_method'}->{'start'}->{'exec'} ne ':true'
- } @services;
+ # Ignore dummy services.
+ @services =
+ grep { $_->{'exec_method'}->{'start'}->{'exec'} ne ':true' } @services;
error("No SMF services found in @manifests") unless @services;