Message ID | 20240514105651.225925-1-lautrbach@redhat.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 96f6e65f40b5 |
Delegated to: | Petr Lautrbach |
Headers | show |
Series | [1/4] sandbox: do not fail without xmodmap | expand |
On Tue, May 14, 2024 at 7:25 AM Petr Lautrbach <lautrbach@redhat.com> wrote: > > Signed-off-by: Petr Lautrbach <lautrbach@redhat.com> For these four patches: Acked-by: James Carter <jwcart2@gmail.com> > --- > sandbox/sandbox | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/sandbox/sandbox b/sandbox/sandbox > index fe631a92cecd..c2ae4de69128 100644 > --- a/sandbox/sandbox > +++ b/sandbox/sandbox > @@ -479,7 +479,10 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [- > > xmodmapfile = self.__homedir + "/.xmodmap" > xd = open(xmodmapfile, "w") > - subprocess.Popen(["/usr/bin/xmodmap", "-pke"], stdout=xd).wait() > + try: > + subprocess.Popen(["/usr/bin/xmodmap", "-pke"], stdout=xd).wait() > + except: > + pass > xd.close() > > self.__setup_sandboxrc(self.__options.wm) > -- > 2.45.0 > >
James Carter <jwcart2@gmail.com> writes: > On Tue, May 14, 2024 at 7:25 AM Petr Lautrbach <lautrbach@redhat.com> wrote: >> >> Signed-off-by: Petr Lautrbach <lautrbach@redhat.com> > > For these four patches: > Acked-by: James Carter <jwcart2@gmail.com> Merged, thanks! > >> --- >> sandbox/sandbox | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/sandbox/sandbox b/sandbox/sandbox >> index fe631a92cecd..c2ae4de69128 100644 >> --- a/sandbox/sandbox >> +++ b/sandbox/sandbox >> @@ -479,7 +479,10 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [- >> >> xmodmapfile = self.__homedir + "/.xmodmap" >> xd = open(xmodmapfile, "w") >> - subprocess.Popen(["/usr/bin/xmodmap", "-pke"], stdout=xd).wait() >> + try: >> + subprocess.Popen(["/usr/bin/xmodmap", "-pke"], stdout=xd).wait() >> + except: >> + pass >> xd.close() >> >> self.__setup_sandboxrc(self.__options.wm) >> -- >> 2.45.0 >> >>
diff --git a/sandbox/sandbox b/sandbox/sandbox index fe631a92cecd..c2ae4de69128 100644 --- a/sandbox/sandbox +++ b/sandbox/sandbox @@ -479,7 +479,10 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [- xmodmapfile = self.__homedir + "/.xmodmap" xd = open(xmodmapfile, "w") - subprocess.Popen(["/usr/bin/xmodmap", "-pke"], stdout=xd).wait() + try: + subprocess.Popen(["/usr/bin/xmodmap", "-pke"], stdout=xd).wait() + except: + pass xd.close() self.__setup_sandboxrc(self.__options.wm)
Signed-off-by: Petr Lautrbach <lautrbach@redhat.com> --- sandbox/sandbox | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)