Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cosmic-session for openSUSE:Factory
checked in at 2024-09-25 21:54:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cosmic-session (Old)
and /work/SRC/openSUSE:Factory/.cosmic-session.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cosmic-session"
Wed Sep 25 21:54:54 2024 rev:2 rq:1203366 version:1.0.0~alpha2
Changes:
--------
--- /work/SRC/openSUSE:Factory/cosmic-session/cosmic-session.changes
2024-08-12 12:30:38.845216940 +0200
+++ /work/SRC/openSUSE:Factory/.cosmic-session.new.29891/cosmic-session.changes
2024-09-25 21:55:35.802035243 +0200
@@ -1,0 +2,10 @@
+Wed Sep 25 06:45:48 UTC 2024 - Richard Rahl <rra...@opensuse.org>
+
+- update to 1.0.0~alpha2:
+ * Simplify is_systemd_used
+ * Fix compile-time errors with --no-default-features
+ * Builds without systemd should no longer hard depend on journald
+ * Make failure to connect to journald a warning, not a hard error
+ * start-cosmic: Set QT auto scaling env variables
+
+-------------------------------------------------------------------
Old:
----
cosmic-session-1.0.0~alpha1.tar.zst
New:
----
cosmic-session-1.0.0~alpha2.tar.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cosmic-session.spec ++++++
--- /var/tmp/diff_new_pack.0cPK8I/_old 2024-09-25 21:55:37.170092145 +0200
+++ /var/tmp/diff_new_pack.0cPK8I/_new 2024-09-25 21:55:37.170092145 +0200
@@ -17,7 +17,7 @@
Name: cosmic-session
-Version: 1.0.0~alpha1
+Version: 1.0.0~alpha2
Release: 0
Summary: Session manager for the COSMIC desktop environment
License: GPL-3.0-only
++++++ _service ++++++
--- /var/tmp/diff_new_pack.0cPK8I/_old 2024-09-25 21:55:37.206093643 +0200
+++ /var/tmp/diff_new_pack.0cPK8I/_new 2024-09-25 21:55:37.210093810 +0200
@@ -3,9 +3,9 @@
<service name="tar_scm" mode="manual">
<param name="url">https://github.com/pop-os/cosmic-session.git</param>
<param name="scm">git</param>
- <param name="revision">refs/tags/epoch-1.0.0-alpha.1</param>
+ <param name="revision">refs/tags/epoch-1.0.0-alpha.2</param>
<param name="versionrewrite-pattern">epoch-(.*)</param>
- <param name="versionformat">1.0.0~alpha1</param>
+ <param name="versionformat">1.0.0~alpha2</param>
<param name="package-meta">yes</param>
<param name="filename">cosmic-session</param>
</service>
++++++ cosmic-session-1.0.0~alpha1.tar.zst ->
cosmic-session-1.0.0~alpha2.tar.zst ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cosmic-session-1.0.0~alpha1/.git/HEAD
new/cosmic-session-1.0.0~alpha2/.git/HEAD
--- old/cosmic-session-1.0.0~alpha1/.git/HEAD 2024-07-31 20:17:20.000000000
+0200
+++ new/cosmic-session-1.0.0~alpha2/.git/HEAD 2024-09-17 18:06:12.000000000
+0200
@@ -1 +1 @@
-c3de3d24dd200d5f8a19a26de56590472f461574
+d06f94a8a01c47b01e0b490c98e0f6d7242ceadd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cosmic-session-1.0.0~alpha1/.git/ORIG_HEAD
new/cosmic-session-1.0.0~alpha2/.git/ORIG_HEAD
--- old/cosmic-session-1.0.0~alpha1/.git/ORIG_HEAD 2024-07-31
20:17:20.000000000 +0200
+++ new/cosmic-session-1.0.0~alpha2/.git/ORIG_HEAD 2024-09-17
18:06:12.000000000 +0200
@@ -1 +1 @@
-c3de3d24dd200d5f8a19a26de56590472f461574
+d06f94a8a01c47b01e0b490c98e0f6d7242ceadd
Binary files old/cosmic-session-1.0.0~alpha1/.git/index and
new/cosmic-session-1.0.0~alpha2/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cosmic-session-1.0.0~alpha1/.git/logs/HEAD
new/cosmic-session-1.0.0~alpha2/.git/logs/HEAD
--- old/cosmic-session-1.0.0~alpha1/.git/logs/HEAD 2024-07-31
20:17:20.000000000 +0200
+++ new/cosmic-session-1.0.0~alpha2/.git/logs/HEAD 2024-09-17
18:06:12.000000000 +0200
@@ -1,2 +1,2 @@
-0000000000000000000000000000000000000000
c3de3d24dd200d5f8a19a26de56590472f461574 Richard Rahl
<user@localhost.localdomain> 1723032596 +0200 clone: from
https://github.com/pop-os/cosmic-session.git
-c3de3d24dd200d5f8a19a26de56590472f461574
c3de3d24dd200d5f8a19a26de56590472f461574 Richard Rahl
<user@localhost.localdomain> 1723032597 +0200 checkout: moving from master to
epoch-1.0.0-alpha.1
+0000000000000000000000000000000000000000
d06f94a8a01c47b01e0b490c98e0f6d7242ceadd Richard Rahl
<user@localhost.localdomain> 1727222731 +0200 clone: from
https://github.com/pop-os/cosmic-session.git
+d06f94a8a01c47b01e0b490c98e0f6d7242ceadd
d06f94a8a01c47b01e0b490c98e0f6d7242ceadd Richard Rahl
<user@localhost.localdomain> 1727222731 +0200 checkout: moving from master to
refs/tags/epoch-1.0.0-alpha.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cosmic-session-1.0.0~alpha1/.git/logs/refs/heads/master
new/cosmic-session-1.0.0~alpha2/.git/logs/refs/heads/master
--- old/cosmic-session-1.0.0~alpha1/.git/logs/refs/heads/master 2024-07-31
20:17:20.000000000 +0200
+++ new/cosmic-session-1.0.0~alpha2/.git/logs/refs/heads/master 2024-09-17
18:06:12.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000
c3de3d24dd200d5f8a19a26de56590472f461574 Richard Rahl
<user@localhost.localdomain> 1723032596 +0200 clone: from
https://github.com/pop-os/cosmic-session.git
+0000000000000000000000000000000000000000
d06f94a8a01c47b01e0b490c98e0f6d7242ceadd Richard Rahl
<user@localhost.localdomain> 1727222731 +0200 clone: from
https://github.com/pop-os/cosmic-session.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cosmic-session-1.0.0~alpha1/.git/logs/refs/remotes/origin/HEAD
new/cosmic-session-1.0.0~alpha2/.git/logs/refs/remotes/origin/HEAD
--- old/cosmic-session-1.0.0~alpha1/.git/logs/refs/remotes/origin/HEAD
2024-07-31 20:17:20.000000000 +0200
+++ new/cosmic-session-1.0.0~alpha2/.git/logs/refs/remotes/origin/HEAD
2024-09-17 18:06:12.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000
c3de3d24dd200d5f8a19a26de56590472f461574 Richard Rahl
<user@localhost.localdomain> 1723032596 +0200 clone: from
https://github.com/pop-os/cosmic-session.git
+0000000000000000000000000000000000000000
d06f94a8a01c47b01e0b490c98e0f6d7242ceadd Richard Rahl
<user@localhost.localdomain> 1727222731 +0200 clone: from
https://github.com/pop-os/cosmic-session.git
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-4f43080361a9e639d4b479f7b8b6e91aa25d6b88.idx
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-4f43080361a9e639d4b479f7b8b6e91aa25d6b88.idx
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-4f43080361a9e639d4b479f7b8b6e91aa25d6b88.pack
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-4f43080361a9e639d4b479f7b8b6e91aa25d6b88.pack
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-4f43080361a9e639d4b479f7b8b6e91aa25d6b88.promisor
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-4f43080361a9e639d4b479f7b8b6e91aa25d6b88.promisor
---
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-4f43080361a9e639d4b479f7b8b6e91aa25d6b88.promisor
1970-01-01 01:00:00.000000000 +0100
+++
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-4f43080361a9e639d4b479f7b8b6e91aa25d6b88.promisor
2024-09-17 18:06:12.000000000 +0200
@@ -0,0 +1,4 @@
+d06f94a8a01c47b01e0b490c98e0f6d7242ceadd HEAD
+d06f94a8a01c47b01e0b490c98e0f6d7242ceadd refs/heads/master
+c3de3d24dd200d5f8a19a26de56590472f461574 refs/tags/epoch-1.0.0-alpha.1
+d06f94a8a01c47b01e0b490c98e0f6d7242ceadd refs/tags/epoch-1.0.0-alpha.2
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-4f43080361a9e639d4b479f7b8b6e91aa25d6b88.rev
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-4f43080361a9e639d4b479f7b8b6e91aa25d6b88.rev
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-501e7ebe7781aaebba0e969456c7138b8df3ae9e.idx
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-501e7ebe7781aaebba0e969456c7138b8df3ae9e.idx
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-501e7ebe7781aaebba0e969456c7138b8df3ae9e.pack
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-501e7ebe7781aaebba0e969456c7138b8df3ae9e.pack
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-501e7ebe7781aaebba0e969456c7138b8df3ae9e.rev
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-501e7ebe7781aaebba0e969456c7138b8df3ae9e.rev
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-60743102ca4bc269b7278660549d317358d94c5d.idx
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-60743102ca4bc269b7278660549d317358d94c5d.idx
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-60743102ca4bc269b7278660549d317358d94c5d.pack
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-60743102ca4bc269b7278660549d317358d94c5d.pack
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-60743102ca4bc269b7278660549d317358d94c5d.rev
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-60743102ca4bc269b7278660549d317358d94c5d.rev
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-b4cab447d25ec85f5acf1e2f37392b014c17678a.idx
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-b4cab447d25ec85f5acf1e2f37392b014c17678a.idx
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-b4cab447d25ec85f5acf1e2f37392b014c17678a.pack
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-b4cab447d25ec85f5acf1e2f37392b014c17678a.pack
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-b4cab447d25ec85f5acf1e2f37392b014c17678a.rev
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-b4cab447d25ec85f5acf1e2f37392b014c17678a.rev
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-b9dbc30d40542f225fea67cc28a641897fc3c678.idx
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-b9dbc30d40542f225fea67cc28a641897fc3c678.idx
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-b9dbc30d40542f225fea67cc28a641897fc3c678.pack
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-b9dbc30d40542f225fea67cc28a641897fc3c678.pack
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-b9dbc30d40542f225fea67cc28a641897fc3c678.rev
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-b9dbc30d40542f225fea67cc28a641897fc3c678.rev
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-d22ce55cbe6aa01df0ddeaec6ec036a91ad7dfa5.idx
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-d22ce55cbe6aa01df0ddeaec6ec036a91ad7dfa5.idx
differ
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-d22ce55cbe6aa01df0ddeaec6ec036a91ad7dfa5.pack
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-d22ce55cbe6aa01df0ddeaec6ec036a91ad7dfa5.pack
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-d22ce55cbe6aa01df0ddeaec6ec036a91ad7dfa5.promisor
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-d22ce55cbe6aa01df0ddeaec6ec036a91ad7dfa5.promisor
---
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-d22ce55cbe6aa01df0ddeaec6ec036a91ad7dfa5.promisor
2024-07-31 20:17:20.000000000 +0200
+++
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-d22ce55cbe6aa01df0ddeaec6ec036a91ad7dfa5.promisor
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-c3de3d24dd200d5f8a19a26de56590472f461574 HEAD
-c3de3d24dd200d5f8a19a26de56590472f461574 refs/heads/master
-c3de3d24dd200d5f8a19a26de56590472f461574 refs/tags/epoch-1.0.0-alpha.1
Binary files
old/cosmic-session-1.0.0~alpha1/.git/objects/pack/pack-d22ce55cbe6aa01df0ddeaec6ec036a91ad7dfa5.rev
and
new/cosmic-session-1.0.0~alpha2/.git/objects/pack/pack-d22ce55cbe6aa01df0ddeaec6ec036a91ad7dfa5.rev
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cosmic-session-1.0.0~alpha1/.git/packed-refs
new/cosmic-session-1.0.0~alpha2/.git/packed-refs
--- old/cosmic-session-1.0.0~alpha1/.git/packed-refs 2024-07-31
20:17:20.000000000 +0200
+++ new/cosmic-session-1.0.0~alpha2/.git/packed-refs 2024-09-17
18:06:12.000000000 +0200
@@ -1,3 +1,4 @@
# pack-refs with: peeled fully-peeled sorted
-c3de3d24dd200d5f8a19a26de56590472f461574 refs/remotes/origin/master
+d06f94a8a01c47b01e0b490c98e0f6d7242ceadd refs/remotes/origin/master
c3de3d24dd200d5f8a19a26de56590472f461574 refs/tags/epoch-1.0.0-alpha.1
+d06f94a8a01c47b01e0b490c98e0f6d7242ceadd refs/tags/epoch-1.0.0-alpha.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cosmic-session-1.0.0~alpha1/.git/refs/heads/master
new/cosmic-session-1.0.0~alpha2/.git/refs/heads/master
--- old/cosmic-session-1.0.0~alpha1/.git/refs/heads/master 2024-07-31
20:17:20.000000000 +0200
+++ new/cosmic-session-1.0.0~alpha2/.git/refs/heads/master 2024-09-17
18:06:12.000000000 +0200
@@ -1 +1 @@
-c3de3d24dd200d5f8a19a26de56590472f461574
+d06f94a8a01c47b01e0b490c98e0f6d7242ceadd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cosmic-session-1.0.0~alpha1/Cargo.toml
new/cosmic-session-1.0.0~alpha2/Cargo.toml
--- old/cosmic-session-1.0.0~alpha1/Cargo.toml 2024-07-31 20:17:20.000000000
+0200
+++ new/cosmic-session-1.0.0~alpha2/Cargo.toml 2024-09-17 18:06:12.000000000
+0200
@@ -39,11 +39,11 @@
] }
tokio-util = "0.7"
tracing = "0.1"
-tracing-journald = "0.3"
+tracing-journald = { version = "0.3", optional = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
cosmic-notifications-util = { git =
"https://github.com/pop-os/cosmic-notifications"; }
[features]
-systemd = ["dep:zbus_systemd"]
+systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
default = ["systemd"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cosmic-session-1.0.0~alpha1/data/start-cosmic
new/cosmic-session-1.0.0~alpha2/data/start-cosmic
--- old/cosmic-session-1.0.0~alpha1/data/start-cosmic 2024-07-31
20:17:20.000000000 +0200
+++ new/cosmic-session-1.0.0~alpha2/data/start-cosmic 2024-09-17
18:06:12.000000000 +0200
@@ -35,6 +35,8 @@
export GDK_BACKEND=wayland,x11
export MOZ_ENABLE_WAYLAND=1
export QT_QPA_PLATFORM="wayland;xcb"
+export QT_AUTO_SCREEN_SCALE_FACTOR=1
+export QT_ENABLE_HIGHDPI_SCALING=1
if command -v systemctl >/dev/null; then
# set environment variables for new units started by user service manager
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cosmic-session-1.0.0~alpha1/debian/control
new/cosmic-session-1.0.0~alpha2/debian/control
--- old/cosmic-session-1.0.0~alpha1/debian/control 2024-07-31
20:17:20.000000000 +0200
+++ new/cosmic-session-1.0.0~alpha2/debian/control 2024-09-17
18:06:12.000000000 +0200
@@ -40,4 +40,5 @@
cosmic-store,
cosmic-term,
cosmic-wallpapers,
+ system-config-printer,
Description: The session for the COSMIC desktop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cosmic-session-1.0.0~alpha1/src/main.rs
new/cosmic-session-1.0.0~alpha2/src/main.rs
--- old/cosmic-session-1.0.0~alpha1/src/main.rs 2024-07-31 20:17:20.000000000
+0200
+++ new/cosmic-session-1.0.0~alpha2/src/main.rs 2024-09-17 18:06:12.000000000
+0200
@@ -21,6 +21,7 @@
use futures_util::StreamExt;
use launch_pad::{process::Process, ProcessManager};
use service::SessionRequest;
+#[cfg(feature = "systemd")]
use systemd::{is_systemd_used, spawn_scope};
use tokio::{
net::UnixStream,
@@ -42,26 +43,44 @@
async fn main() -> Result<()> {
color_eyre::install().wrap_err("failed to install color_eyre error
handler")?;
- tracing_subscriber::registry()
- .with(tracing_journald::layer().wrap_err("failed to connect to
journald")?)
+ let trace = tracing_subscriber::registry();
+ let env_filter = EnvFilter::builder()
+ .with_default_directive(LevelFilter::INFO.into())
+ .from_env_lossy();
+
+ #[cfg(feature = "systemd")]
+ if let Ok(journald) = tracing_journald::layer() {
+ trace
+ .with(journald)
+ .with(fmt::layer())
+ .with(env_filter)
+ .try_init()
+ .wrap_err("failed to initialize logger")?;
+ } else {
+ trace
+ .with(fmt::layer())
+ .with(env_filter)
+ .try_init()
+ .wrap_err("failed to initialize logger")?;
+ warn!("failed to connect to journald")
+ }
+
+ #[cfg(not(feature = "systemd"))]
+ trace
.with(fmt::layer())
- .with(
- EnvFilter::builder()
-
.with_default_directive(LevelFilter::INFO.into())
- .from_env_lossy(),
- )
+ .with(env_filter)
.try_init()
.wrap_err("failed to initialize logger")?;
+
log_panics::init();
let (session_tx, mut session_rx) = tokio::sync::mpsc::channel(10);
let session_tx_clone = session_tx.clone();
let _conn = ConnectionBuilder::session()?
.name("com.system76.CosmicSession")?
- .serve_at(
- "/com/system76/CosmicSession",
- service::SessionService { session_tx },
- )?
+ .serve_at("/com/system76/CosmicSession",
service::SessionService {
+ session_tx,
+ })?
.build()
.await?;
@@ -135,8 +154,8 @@
.await
.expect("failed to start settings daemon");
- // notifying the user service manager that we've reached the
graphical-session.target,
- // which should only happen after:
+ // notifying the user service manager that we've reached the
+ // graphical-session.target, which should only happen after:
// - cosmic-comp is ready
// - we've set any related variables
// - cosmic-settings-daemon is ready
@@ -379,22 +398,17 @@
}
.instrument(stderr_span)
})
- .with_on_start(move |pman, pkey, _will_restart|
{
+ .with_on_start(move |pman, pkey, _will_restart|
async move {
#[cfg(feature = "systemd")]
- {
- async move {
- if *is_systemd_used() {
- if let
Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await
- {
- if let
Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await
- {
-
warn!(
-
"Failed to spawn scope for {}. Creating transient unit
failed with {}",
-
innr_cmd, err
-
);
- };
- }
- }
+ if *is_systemd_used() {
+ if let Ok((innr_cmd,
Some(pid))) = pman.get_exe_and_pid(pkey).await {
+ if let Err(err) =
spawn_scope(innr_cmd.clone(), vec![pid]).await {
+ warn!(
+ "Failed
to spawn scope for {}. Creating transient unit failed \
+ with
{}",
+
innr_cmd, err
+ );
+ };
}
}
})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cosmic-session-1.0.0~alpha1/src/systemd.rs
new/cosmic-session-1.0.0~alpha2/src/systemd.rs
--- old/cosmic-session-1.0.0~alpha1/src/systemd.rs 2024-07-31
20:17:20.000000000 +0200
+++ new/cosmic-session-1.0.0~alpha2/src/systemd.rs 2024-09-17
18:06:12.000000000 +0200
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
+use std::path::Path;
use std::process::{Command, Stdio};
use std::sync::OnceLock;
@@ -33,21 +34,7 @@
///Determine if systemd is used as the init system. This should work on all
linux distributions.
pub fn is_systemd_used() -> &'static bool {
static IS_SYSTEMD_USED: OnceLock<bool> = OnceLock::new();
- IS_SYSTEMD_USED.get_or_init(|| {
- match Command::new("ls").args(["/run/systemd/system"]).output()
{
- Ok(output) => {
- if output.status.success() {
- true
- } else {
- false
- }
- }
- Err(error) => {
- warn!("unable to check if systemd is used: {}",
error);
- false
- }
- }
- })
+ IS_SYSTEMD_USED.get_or_init(||
Path::new("/run/systemd/system").exists())
}
#[cfg(feature = "systemd")]
++++++ vendor.tar.zst ++++++
/work/SRC/openSUSE:Factory/cosmic-session/vendor.tar.zst
/work/SRC/openSUSE:Factory/.cosmic-session.new.29891/vendor.tar.zst differ:
char 1342183, line 5244
