On Tue, Sep 01, 2009 at 03:53:50PM -0400, Joey Hess wrote:
> Steve Langasek wrote:
> > Looking at this, one of the places that the dh_installupstart behavior is
> > incompatible with dh_installinit is --onlyscripts. Since by design this
> > option implies we're not looking in debian/ for either a .upstart or a .init
> > file, it's ambiguous which set of maintainer script snippets to use.
> I have not seen any maintainer script snippets for upstart in this bug
> report. With upstart-job, the existing init script snippets should just
> work, no?
Um... true. I think what I meant to refer to was this chunk:
+ if ($job ne '' || $dh{ONLYSCRIPTS_UPSTART}) {
+ if (! $dh{ONLYSCRIPTS_UPSTART}) {
+ if (! -d "$tmp/etc/init") {
+ doit("install","-d","$tmp/etc/init");
+ }
+
+
doit("install","-p","-m644",$job,"$tmp/etc/init/$jobfile.conf");
+ }
+
+ # ensures that our /etc/init.d/ symlink points to a valid
+ # implementation
+ addsubstvar($package, "misc:Depends", "upstart-job");
+
+ if (! -d "$tmp/etc/init.d") {
+ doit("install","-d","$tmp/etc/init.d");
+ }
+
doit("ln","-sf","/lib/init/upstart-job","$tmp/etc/init.d/$jobfile");
+ } else {
If we have only a single --onlyscripts option, we can't detect whether the
last part of this should be done - we don't want symlinks to be created and
dependencies to be added if the package is just shipping an init script, but
we do want this to happen any time the package is shipping an upstart job,
including when the maintainer wants to install the job file themselves
(--onlyscripts).
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
[email protected] [email protected]
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
