packages: systemd/shut-sysv-up.patch, systemd/systemd.spec - rel 1 - assert...

[baggins]

Author: baggins                      Date: Sun Feb 12 16:17:38 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1
- assert programming rulz

---- Files affected:
packages/systemd:
   shut-sysv-up.patch (1.4 -> 1.5) , systemd.spec (1.113 -> 1.114) 

---- Diffs:

================================================================
Index: packages/systemd/shut-sysv-up.patch
diff -u packages/systemd/shut-sysv-up.patch:1.4 packages/systemd/shut-sysv-up.patch:1.5
--- packages/systemd/shut-sysv-up.patch:1.4	Sun Feb 12 16:34:52 2012
+++ packages/systemd/shut-sysv-up.patch	Sun Feb 12 17:17:33 2012
@@ -1,14 +1,16 @@
 diff -urNp systemd-37.orig/src/unit.c systemd-37/src/unit.c
 --- systemd-37.orig/src/unit.c	2011-09-23 16:28:27.000000000 +0200
 +++ systemd-37/src/unit.c	2011-12-05 21:37:15.000000000 +0100
-@@ -2432,7 +2432,12 @@ void unit_status_printf(Unit *u, const c
+@@ -2432,7 +2432,14 @@ void unit_status_printf(Unit *u, const c
          assert(u);
          assert(format);
  
 -        if (!UNIT_VTABLE(u)->show_status)
 +        if (!UNIT_VTABLE(u)->show_status
 +            || (u->manager->sysv_console
-+                && (startswith(u->description, "SYSV: ") || startswith(u->description, "LSB: "))
++                && (u->description != NULL
++                    && (startswith(u->description, "SYSV: ")
++                        || startswith(u->description, "LSB: ")))
 +                && (u->job == NULL || u->job->result == JOB_DONE)
 +                && UNIT_VTABLE(u)->active_state(u) != UNIT_FAILED
 +                && LOG_PRI(log_get_max_level()) <= LOG_INFO))

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.113 packages/systemd/systemd.spec:1.114
--- packages/systemd/systemd.spec:1.113	Sun Feb 12 16:34:52 2012
+++ packages/systemd/systemd.spec	Sun Feb 12 17:17:33 2012
@@ -18,7 +18,7 @@
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
 Version:	42
-Release:	0.1
+Release:	1
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -695,6 +695,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2012/02/12 16:17:33  baggins
+- rel 1
+- assert programming rulz
+
 Revision 1.113  2012/02/12 15:34:52  baggins
 - C:sudo with global pam session setup (sudo hates pam_systemd)
 - hacked shut-sysv-up.patch into working order
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/shut-sysv-up.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.113&r2=1.114&f=u