Hello community, here is the log from the commit of package WSL-DistroLauncher for openSUSE:Factory checked in at 2020-04-10 23:54:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/WSL-DistroLauncher (Old) and /work/SRC/openSUSE:Factory/.WSL-DistroLauncher.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "WSL-DistroLauncher" Fri Apr 10 23:54:01 2020 rev:2 rq:792983 version:0.0.1+git20200306.f858909 Changes: -------- --- /work/SRC/openSUSE:Factory/WSL-DistroLauncher/WSL-DistroLauncher.changes 2020-01-14 21:13:06.490924382 +0100 +++ /work/SRC/openSUSE:Factory/.WSL-DistroLauncher.new.3248/WSL-DistroLauncher.changes 2020-04-10 23:54:38.888760186 +0200 @@ -1,0 +2,5 @@ +Fri Apr 10 18:31:04 UTC 2020 - Scott Reeves <[email protected]> + +- Update git snapshot - Better error handling on WSL2 startup + +------------------------------------------------------------------- Old: ---- WSL-DistroLauncher-0.0.1+git20181120.d7b1f10.tar.xz New: ---- WSL-DistroLauncher-0.0.1+git20200306.f858909.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ WSL-DistroLauncher.spec ++++++ --- /var/tmp/diff_new_pack.vJv3WS/_old 2020-04-10 23:54:39.660760752 +0200 +++ /var/tmp/diff_new_pack.vJv3WS/_new 2020-04-10 23:54:39.664760755 +0200 @@ -1,7 +1,7 @@ # -# spec file for package wsl-launcher +# spec file for package WSL-DistroLauncher # -# Copyright (c) 2019 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: WSL-DistroLauncher # no official release yet -Version: 0.0.1+git20181120.d7b1f10 +Version: 0.0.1+git20200306.f858909 Release: 0 -License: MIT Summary: Windows Subsystem for Linux distro launcher -Url: https://github.com/openSUSE/WSL-DistroLauncher +License: MIT +URL: https://github.com/openSUSE/WSL-DistroLauncher Source: WSL-DistroLauncher-%{version}.tar.xz Source1: icon.ico @@ -32,11 +33,11 @@ Patch3: 0004-refactor-QueryUid-to-be-reusable.patch Patch4: 0005-Run-yast2-firstboot-instead-of-useradd.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: mingw64-cross-binutils BuildRequires: mingw64-cross-gcc-c++ BuildRequires: mingw64-filesystem -BuildRequires: automake -BuildRequires: autoconf # XXX: that's a bit nasty. Launcher should probably be made run # time configurable when packing the appx ++++++ 0005-Run-yast2-firstboot-instead-of-useradd.patch ++++++ --- /var/tmp/diff_new_pack.vJv3WS/_old 2020-04-10 23:54:39.696760778 +0200 +++ /var/tmp/diff_new_pack.vJv3WS/_new 2020-04-10 23:54:39.696760778 +0200 @@ -119,13 +119,6 @@ if (FAILED(hr)) { if (hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) { Helpers::PrintMessage(MSG_INSTALL_ALREADY_EXISTS); -@@ -163,4 +154,4 @@ int wmain(int argc, wchar_t const *argv[]) - } - - return SUCCEEDED(hr) ? exitCode : 1; --} -\ No newline at end of file -+} diff --git a/DistroLauncher/messages.mc b/DistroLauncher/messages.mc index 6594f3e..fd6b7a7 100644 --- a/DistroLauncher/messages.mc ++++++ WSL-DistroLauncher-0.0.1+git20181120.d7b1f10.tar.xz -> WSL-DistroLauncher-0.0.1+git20200306.f858909.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WSL-DistroLauncher-0.0.1+git20181120.d7b1f10/DistroLauncher/DistroLauncher.cpp new/WSL-DistroLauncher-0.0.1+git20200306.f858909/DistroLauncher/DistroLauncher.cpp --- old/WSL-DistroLauncher-0.0.1+git20181120.d7b1f10/DistroLauncher/DistroLauncher.cpp 2018-11-20 22:37:32.000000000 +0100 +++ new/WSL-DistroLauncher-0.0.1+git20200306.f858909/DistroLauncher/DistroLauncher.cpp 2020-03-06 22:00:41.000000000 +0100 @@ -119,6 +119,12 @@ if (arguments.empty()) { hr = g_wslApi.WslLaunchInteractive(L"", false, &exitCode); + // Check exitCode to see if wsl.exe returned that it could not start the Linux process + // then prompt users for input so they can view the error message. + if (SUCCEEDED(hr) && exitCode == UINT_MAX) { + Helpers::PromptForInput(); + } + } else if ((arguments[0] == ARG_RUN) || (arguments[0] == ARG_RUN_C)) { @@ -163,4 +169,4 @@ } return SUCCEEDED(hr) ? exitCode : 1; -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WSL-DistroLauncher-0.0.1+git20181120.d7b1f10/README.md new/WSL-DistroLauncher-0.0.1+git20200306.f858909/README.md --- old/WSL-DistroLauncher-0.0.1+git20181120.d7b1f10/README.md 2018-11-20 22:37:32.000000000 +0100 +++ new/WSL-DistroLauncher-0.0.1+git20200306.f858909/README.md 2020-03-06 22:00:41.000000000 +0100 @@ -106,7 +106,7 @@ ### Building the Project (Command line): To compile the project, you can simply type `build` in the root of the project to use MSBuild to build the solution. This is useful for verifying that your application compiles. It will also build an appx for you to sideload on your dev machine for testing. -> Note: We recommend that you buuild your launcher from the "Developer Comamnd Prompt for Visual Studio" which can be launched from the start menu. This command-prompt sets up several path and environment variables to make building easier and smoother. +> Note: We recommend that you build your launcher from the "Developer Command Prompt for Visual Studio" which can be launched from the start menu. This command-prompt sets up several path and environment variables to make building easier and smoother. `build.bat` assumes that MSBuild is installed at one of the following paths: `%ProgramFiles*%\MSBuild\14.0\bin\msbuild.exe` or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WSL-DistroLauncher-0.0.1+git20181120.d7b1f10/build.bat new/WSL-DistroLauncher-0.0.1+git20200306.f858909/build.bat --- old/WSL-DistroLauncher-0.0.1+git20181120.d7b1f10/build.bat 2018-11-20 22:37:32.000000000 +0100 +++ new/WSL-DistroLauncher-0.0.1+git20200306.f858909/build.bat 2020-03-06 22:00:41.000000000 +0100 @@ -26,6 +26,10 @@ set MSBUILD="%ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe" goto :FOUND_MSBUILD ) +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Preview\MSBuild\Current\Bin\MSBuild.exe" ( + set MSBUILD="%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Preview\MSBuild\Current\Bin\MSBuild.exe" + goto :FOUND_MSBUILD +) if exist "%ProgramFiles(x86)%\MSBuild\14.0\bin" ( set MSBUILD="%ProgramFiles(x86)%\MSBuild\14.0\bin\msbuild.exe" goto :FOUND_MSBUILD ++++++ _service ++++++ --- /var/tmp/diff_new_pack.vJv3WS/_old 2020-04-10 23:54:39.800760854 +0200 +++ /var/tmp/diff_new_pack.vJv3WS/_new 2020-04-10 23:54:39.804760857 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/microsoft/WSL-DistroLauncher.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">d7b1f108abba0ff694b4512322e72cb7af4da46a</param> + <param name="revision">f858909d675f8d80e0666d2258bc43abf9c5e132</param> <param name="versionformat">0.0.1+git%cd.%h</param> </service> <service name="recompress" mode="disabled">
