Skip to content

Commit c0ff431

Browse files
SeigerSeiger
authored
Merge pull request #2485 from elcreator/composer-out-of-process
fix(packages): run composer as a separate process and roll back failed installs
2 parents ae39b82 + 5e11b38 commit c0ff431

42 files changed

Lines changed: 1905 additions & 203 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎assets/modules/store/lang/az.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/*
3+
* Keys missing here are shown in English: StoreContextService::loadLanguage()
4+
* loads en.php first and this file on top of it.
5+
*/
6+
7+
/* Installation by file-upload */
8+
$_Lang['install_file_artifact_queued'] = 'Composer paketi %1$s %2$s sistem tapşırığı #%3$s kimi quraşdırma növbəsinə əlavə edildi. Planlayıcı onu yüklənmiş arxivdən quraşdıracaq.';
9+
$_Lang['install_file_artifact_no_version'] = 'Arxivdə Composer paketi %1$s var, lakin versiyası yoxdur. Onun composer.json faylına "version" əlavə edin və ya versiyanı fayl adında göstərin, məsələn %2$s-1.0.0.zip.';
10+
$_Lang['install_file_artifact_failed'] = 'Composer paketi %1$s növbəyə əlavə edilə bilmədi: %2$s';
11+
$_Lang['install_file_artifact_invalid'] = 'Arxiv Composer paketinə bənzəyir, lakin %1$s paket adı "name" olan düzgün JSON deyil. Heç nə quraşdırılmadı.';

‎assets/modules/store/lang/be.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/*
3+
* Keys missing here are shown in English: StoreContextService::loadLanguage()
4+
* loads en.php first and this file on top of it.
5+
*/
6+
7+
/* Installation by file-upload */
8+
$_Lang['install_file_artifact_queued'] = 'Composer-пакет %1$s %2$s пастаўлены ў чаргу на ўсталяванне як сістэмная задача #%3$s. Планавальнік усталюе яго з запампаванага архіва.';
9+
$_Lang['install_file_artifact_no_version'] = 'Архіў змяшчае Composer-пакет %1$s, але без версіі. Дадайце "version" у яго composer.json або пазначце версію ў назве файла, напрыклад %2$s-1.0.0.zip.';
10+
$_Lang['install_file_artifact_failed'] = 'Не атрымалася паставіць Composer-пакет %1$s у чаргу: %2$s';
11+
$_Lang['install_file_artifact_invalid'] = 'Архіў падобны на Composer-пакет, але %1$s не з\'яўляецца карэктным JSON з назвай пакета "name". Нічога не ўсталявана.';

‎assets/modules/store/lang/bg.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/*
3+
* Keys missing here are shown in English: StoreContextService::loadLanguage()
4+
* loads en.php first and this file on top of it.
5+
*/
6+
7+
/* Installation by file-upload */
8+
$_Lang['install_file_artifact_queued'] = 'Composer пакетът %1$s %2$s е добавен в опашката за инсталиране като системна задача #%3$s. Планировчикът ще го инсталира от каченото архивно копие.';
9+
$_Lang['install_file_artifact_no_version'] = 'Архивът съдържа Composer пакета %1$s, но без версия. Добавете "version" в неговия composer.json или посочете версията в името на файла, например %2$s-1.0.0.zip.';
10+
$_Lang['install_file_artifact_failed'] = 'Composer пакетът %1$s не можа да бъде добавен в опашката: %2$s';
11+
$_Lang['install_file_artifact_invalid'] = 'Архивът прилича на Composer пакет, но %1$s не е валиден JSON с име на пакет "name". Нищо не е инсталирано.';

‎assets/modules/store/lang/cs.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/*
3+
* Keys missing here are shown in English: StoreContextService::loadLanguage()
4+
* loads en.php first and this file on top of it.
5+
*/
6+
7+
/* Installation by file-upload */
8+
$_Lang['install_file_artifact_queued'] = 'Balíček Composer %1$s %2$s je zařazen k instalaci jako systémová úloha #%3$s. Plánovač jej nainstaluje z nahraného archivu.';
9+
$_Lang['install_file_artifact_no_version'] = 'Archiv obsahuje balíček Composer %1$s, ale bez verze. Přidejte "version" do jeho composer.json nebo uveďte verzi v názvu souboru, např. %2$s-1.0.0.zip.';
10+
$_Lang['install_file_artifact_failed'] = 'Balíček Composer %1$s se nepodařilo zařadit do fronty: %2$s';
11+
$_Lang['install_file_artifact_invalid'] = 'Archiv vypadá jako balíček Composer, ale %1$s není platný JSON s názvem balíčku "name". Nic nebylo nainstalováno.';

‎assets/modules/store/lang/da.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/*
3+
* Keys missing here are shown in English: StoreContextService::loadLanguage()
4+
* loads en.php first and this file on top of it.
5+
*/
6+
7+
/* Installation by file-upload */
8+
$_Lang['install_file_artifact_queued'] = 'Composer-pakken %1$s %2$s er sat i kø til installation som systemopgave #%3$s. Planlæggeren installerer den fra det uploadede arkiv.';
9+
$_Lang['install_file_artifact_no_version'] = 'Arkivet indeholder Composer-pakken %1$s, men uden version. Tilføj "version" til dens composer.json, eller angiv versionen i filnavnet, f.eks. %2$s-1.0.0.zip.';
10+
$_Lang['install_file_artifact_failed'] = 'Composer-pakken %1$s kunne ikke sættes i kø: %2$s';
11+
$_Lang['install_file_artifact_invalid'] = 'Arkivet ligner en Composer-pakke, men %1$s er ikke gyldig JSON med et pakkenavn "name". Intet blev installeret.';

‎assets/modules/store/lang/de.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/*
3+
* Keys missing here are shown in English: StoreContextService::loadLanguage()
4+
* loads en.php first and this file on top of it.
5+
*/
6+
7+
/* Installation by file-upload */
8+
$_Lang['install_file_artifact_queued'] = 'Das Composer-Paket %1$s %2$s ist als Systemaufgabe #%3$s zur Installation eingeplant. Der Scheduler installiert es aus dem hochgeladenen Archiv.';
9+
$_Lang['install_file_artifact_no_version'] = 'Das Archiv enthält das Composer-Paket %1$s, aber keine Version. Ergänzen Sie "version" in seiner composer.json oder geben Sie die Version im Dateinamen an, z. B. %2$s-1.0.0.zip.';
10+
$_Lang['install_file_artifact_failed'] = 'Das Composer-Paket %1$s konnte nicht eingeplant werden: %2$s';
11+
$_Lang['install_file_artifact_invalid'] = 'Das Archiv sieht aus wie ein Composer-Paket, aber %1$s ist kein gültiges JSON mit einem Paketnamen "name". Es wurde nichts installiert.';

‎assets/modules/store/lang/en.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@
116116
$_Lang['choose_file_msg'] = "Choose a file to upload and install";
117117
$_Lang['install_file_btn'] = "Install";
118118
$_Lang['install_file_success'] = "Installation successful";
119+
$_Lang['install_file_artifact_queued'] = 'Composer package %1$s %2$s is queued for installation as system task #%3$s. The scheduler installs it from the uploaded archive.';
120+
$_Lang['install_file_artifact_no_version'] = 'The archive holds Composer package %1$s but no version. Add "version" to its composer.json or put the version in the file name, e.g. %2$s-1.0.0.zip.';
121+
$_Lang['install_file_artifact_failed'] = 'Composer package %1$s could not be queued: %2$s';
122+
$_Lang['install_file_artifact_invalid'] = 'The archive looks like a Composer package, but %1$s is not valid JSON with a package "name". Nothing was installed.';
119123

120124
/* faq */
121125
$_Lang['faq'] = '

‎assets/modules/store/lang/es.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/*
3+
* Keys missing here are shown in English: StoreContextService::loadLanguage()
4+
* loads en.php first and this file on top of it.
5+
*/
6+
7+
/* Installation by file-upload */
8+
$_Lang['install_file_artifact_queued'] = 'El paquete de Composer %1$s %2$s está en cola para instalarse como tarea del sistema #%3$s. El planificador lo instalará desde el archivo subido.';
9+
$_Lang['install_file_artifact_no_version'] = 'El archivo contiene el paquete de Composer %1$s, pero sin versión. Añada "version" a su composer.json o indique la versión en el nombre del archivo, p. ej. %2$s-1.0.0.zip.';
10+
$_Lang['install_file_artifact_failed'] = 'No se pudo poner en cola el paquete de Composer %1$s: %2$s';
11+
$_Lang['install_file_artifact_invalid'] = 'El archivo parece un paquete de Composer, pero %1$s no es un JSON válido con un nombre de paquete "name". No se instaló nada.';

‎assets/modules/store/lang/fa.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/*
3+
* Keys missing here are shown in English: StoreContextService::loadLanguage()
4+
* loads en.php first and this file on top of it.
5+
*/
6+
7+
/* Installation by file-upload */
8+
$_Lang['install_file_artifact_queued'] = 'بسته Composer %1$s %2$s به‌عنوان وظیفه سیستمی #%3$s در صف نصب قرار گرفت. زمان‌بند آن را از بایگانی بارگذاری‌شده نصب می‌کند.';
9+
$_Lang['install_file_artifact_no_version'] = 'بایگانی شامل بسته Composer %1$s است، اما نسخه ندارد. "version" را به composer.json آن اضافه کنید یا نسخه را در نام فایل بنویسید، مثلاً %2$s-1.0.0.zip.';
10+
$_Lang['install_file_artifact_failed'] = 'بسته Composer %1$s در صف قرار نگرفت: %2$s';
11+
$_Lang['install_file_artifact_invalid'] = 'بایگانی شبیه یک بسته Composer است، اما %1$s یک JSON معتبر با نام بسته "name" نیست. چیزی نصب نشد.';

‎assets/modules/store/lang/fi.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/*
3+
* Keys missing here are shown in English: StoreContextService::loadLanguage()
4+
* loads en.php first and this file on top of it.
5+
*/
6+
7+
/* Installation by file-upload */
8+
$_Lang['install_file_artifact_queued'] = 'Composer-paketti %1$s %2$s on jonossa asennettavaksi järjestelmätehtävänä #%3$s. Ajastin asentaa sen ladatusta arkistosta.';
9+
$_Lang['install_file_artifact_no_version'] = 'Arkisto sisältää Composer-paketin %1$s, mutta ilman versiota. Lisää "version" sen composer.json-tiedostoon tai kirjoita versio tiedostonimeen, esim. %2$s-1.0.0.zip.';
10+
$_Lang['install_file_artifact_failed'] = 'Composer-pakettia %1$s ei voitu lisätä jonoon: %2$s';
11+
$_Lang['install_file_artifact_invalid'] = 'Arkisto näyttää Composer-paketilta, mutta %1$s ei ole kelvollista JSONia, jossa on paketin nimi "name". Mitään ei asennettu.';

0 commit comments

Comments
 (0)