blob: 9e6fc404629393502f5068b9b5d825fd7d664dc6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5Bsoft-commits%5D%20%5B4584%5D%20%28systemd_unit_exists%29%0A%09factorize&In-Reply-To=%3CCAONrEtbWdnCU8z1Mga%2BzyX_CJXx%2B%2B%2BShGpzaB7U51dYKkg%3DCXA%40mail.gmail.com%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="015842.html">
<LINK REL="Next" HREF="015795.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize</H1>
<B>Thierry Vignaud</B>
<A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5Bsoft-commits%5D%20%5B4584%5D%20%28systemd_unit_exists%29%0A%09factorize&In-Reply-To=%3CCAONrEtbWdnCU8z1Mga%2BzyX_CJXx%2B%2B%2BShGpzaB7U51dYKkg%3DCXA%40mail.gmail.com%3E"
TITLE="[Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize">thierry.vignaud at gmail.com
</A><BR>
<I>Wed May 23 20:29:04 CEST 2012</I>
<P><UL>
<LI>Previous message: <A HREF="015842.html">[Mageia-dev] Upgrade: Seamonkey 2.9.1
</A></li>
<LI>Next message: <A HREF="015795.html">[Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#15794">[ date ]</a>
<a href="thread.html#15794">[ thread ]</a>
<a href="subject.html#15794">[ subject ]</a>
<a href="author.html#15794">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>On 23 May 2012 20:25, <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">root at mageia.org</A>> wrote:
><i> Revision 4584 Author tv Date 2012-05-23 20:25:15 +0200 (Wed, 23 May 2012)
</I>><i>
</I>><i> Log Message
</I>><i>
</I>><i> (systemd_unit_exists) factorize
</I>><i>
</I>><i> Modified Paths
</I>><i>
</I>><i> drakx/trunk/perl-install/services.pm
</I>><i>
</I>><i> Modified: drakx/trunk/perl-install/services.pm
</I>><i> ===================================================================
</I>><i> --- drakx/trunk/perl-install/services.pm 2012-05-23 18:02:37 UTC (rev 4583)
</I>><i> +++ drakx/trunk/perl-install/services.pm 2012-05-23 18:25:15 UTC (rev 4584)
</I>><i> @@ -433,7 +433,7 @@
</I>><i> if (my ($name, $l) = m!^(\S+)\s+(0:(on|off).*)!) {
</I>><i> # If we expect to use systemd (i.e. installer) only show those
</I>><i> # sysvinit scripts which are not masked by a native systemd
</I>><i> unit.
</I>><i> - my $has_systemd_unit = (-e "$::prefix/lib/systemd/system/$name.service" or -l "$::prefix/lib/systemd/system/$name.service");
</I>><i> + my $has_systemd_unit = systemd_unit_exists($name);
</I>><i> if (!$has_systemd || !$has_systemd_unit) {
</I>><i> if ($::isInstall) {
</I>><i> $on_off = $l =~ /\d+:on/g;
</I>><i> @@ -466,12 +466,14 @@
</I>><i>
</I>><i>
</I>><i>
</I>><i> +sub systemd_unit_exists {
</I>><i> + my ($name) = @_;
</I>><i> + -e "$::prefix/lib/systemd/system/$name.service" or -l "$::prefix/lib/systemd/system/$name.service";
</I>><i> +}
</I>><i>
</I>><i> -
</I>><i> -
</I>><i> sub service_exists {
</I>><i> my ($service) = @_;
</I>><i> - -x "$::prefix/etc/rc.d/init.d/$service" or -e "$::prefix/lib/systemd/system/$service.service" or -l "$::prefix/lib/systemd/system/$service.service";
</I>><i> + -x "$::prefix/etc/rc.d/init.d/$service" or systemd_unit_exists($service);
</I>><i> }
</I>
BTW Colin your test is redundant. -e returns true for symlinks too
(unless target doesn't exist in which case we don't care much anyway...)
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="015842.html">[Mageia-dev] Upgrade: Seamonkey 2.9.1
</A></li>
<LI>Next message: <A HREF="015795.html">[Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#15794">[ date ]</a>
<a href="thread.html#15794">[ thread ]</a>
<a href="subject.html#15794">[ subject ]</a>
<a href="author.html#15794">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev
mailing list</a><br>
</body></html>
|
