From 812abee2fe09f470588c49d96baf0262fd431a83 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 28 Mar 2017 17:20:32 +0200 Subject: [PATCH] www-apps/gitlab-ce: Moved warning about MySQL migrations to the postinst phase, as the config phase might fail when the database is not updated. So the message must be displayed earlier. Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- www-apps/gitlab-ce/ChangeLog | 6 ++++++ www-apps/gitlab-ce/Manifest | 6 +++--- www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild | 9 +++++---- www-apps/gitlab-ce/gitlab-ce-9999.ebuild | 9 +++++---- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog index c4c1125..f03c9a7 100644 --- a/www-apps/gitlab-ce/ChangeLog +++ b/www-apps/gitlab-ce/ChangeLog @@ -1,3 +1,9 @@ + 28 Mar 2017; Manuel Friedli gitlab-ce-9.0.0.ebuild, + gitlab-ce-9999.ebuild: + www-apps/gitlab-ce: Moved warning about MySQL migrations to the postinst + phase, as the config phase might fail when the database is not updated. So the + message must be displayed earlier. + 28 Mar 2017; Manuel Friedli gitlab-ce-9.0.0.ebuild, gitlab-ce-9999.ebuild: www-apps/gitlab-ce: Fixed the latest ebuild to use yarn instead of npm. diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index c4994cf..5702502 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -23,8 +23,8 @@ DIST gitlab-ce-9.0.0_rc4.tar.gz 26270878 SHA256 f47ddcf6f4f0336228dd1ef03085c9ea EBUILD gitlab-ce-8.15.8.ebuild 11982 SHA256 755bfd6fa532a308d3f458db1456f8de4f2c5f599ab76c18653aad9e038d0697 SHA512 9aa439da7dc61687f1cdce5ff693dd1c8c4edc54aaed288ad0368aa1b64d577a7f3752dee149c200c4d98b43a6347c77251cac9f6d3316b5a6d799a17c3ed583 WHIRLPOOL 02393bfd983341632663096e8b293e3611ac5328a58a50a1c7e800e348e866f37aff53ebe447507a84d5966e019265fde94a30716f43b50228437e04abcd932c EBUILD gitlab-ce-8.16.8.ebuild 11982 SHA256 31537d4a6aeb9ff14ab14c9a27dca51a056e94ee75506ad855a1289f32468694 SHA512 01d536fcfb53a7b39943314a34eeeb9c5b5660604a2fb1a1c2dcd1d7e87d19ab0bbc5bc650feaa1db812047c3783a324d7c8a8bce7dd7381033c3d1ca2e64828 WHIRLPOOL 0f3402e30164ee6d5058c51554cc916d91d5975f438074e3193bf3bdb4e323bca4279c19f00cd7bacd01c2eb6cf13e41a0badabd958e9be58d319224f53403b0 EBUILD gitlab-ce-8.17.4.ebuild 12928 SHA256 f748d42058293ba4f593fbb36be34ecde332d896d04c610fd3b7e91288c18fbb SHA512 3c2736f9b7df066bb105faffef6ce2b6276fe60a686a7462c630a1b7c7c0296d94e33c7ea25a9f24aa814628f318e2430a3e5ca149783c86ef3fb1132dd01877 WHIRLPOOL cd629ba993df3eaef9c9ec1bf1649aa4cfea5f3787d2207a7016c092bff67175d79c6782d643d4c80b3b5971a98858feaa279a184abc4fd936c7e5c8b291dd28 -EBUILD gitlab-ce-9.0.0.ebuild 12933 SHA256 3c0c771e6ece33f3a47f58ebedfaff6b95f603b55916f4424db8617ba0f3774d SHA512 7ba12701c1b3b5e278912e3442024deed208e74bf87e5d49a497404c56bc13a3c5aa0848d9cdba14d8d6393808c9eac7b3b6bd56a564702130e86a7b69e14d7d WHIRLPOOL 169964b11c6e0473276422ff85557669f383506edaa55a8713f35b0bef588b60aae4eac30c1e36313c5b37681f48184b013ff9e647f603b0d8f46475b28091cb +EBUILD gitlab-ce-9.0.0.ebuild 13008 SHA256 3b390e22aa0eda10dafe4c37cc4ccb2ff7e9b4cbbeeba6a64df7255e3440daf6 SHA512 d9f659414d380af24f4fb871f3c50062056b2aebef8f8fae7203b49a9102e55acc6c4be0840575de0953317d3a4fe6b4a4603121072b59cb0459927236cd9434 WHIRLPOOL 667ac5e2ba8ac7406dbd30e84ae13370eb3b55855e0319073d9295b9d8fbaa5f1e4f47b8ed2603394d77744d797512c653894c55a55ae676b87938d122fcdb5a EBUILD gitlab-ce-9.0.0_rc4.ebuild 12910 SHA256 8851160b4454845fb33ce0b9a9dd3e070bed07d3a0e5c5f753c77b0ef301ded0 SHA512 9d109a3ea8fa7a7bb33440b4b21bf988745c4eefb62b834ad88825f3ffa28881eceaf402ec09241b74d91e778258c1a18daae6c86254625af4f54bf6189b32f2 WHIRLPOOL 67aa480b4cf1209a3d7af3bffb1f7f774bf2c6d18bf40960478e13459813ebb9472adc5aec3b84252157b0c3e74f9e7f74cb0d57395983c02ba4c976ffae106f -EBUILD gitlab-ce-9999.ebuild 12874 SHA256 2c84abbccdfdbb2106d74acfca95509cd667e44b3d55a8058e5e12faff14ff8e SHA512 bfa9273ff0aabddb67d0739915c76bd133c2a08f1f24526f6f5de4ab59cca270e91e30a749fb6593b0604c9e4361639245216315a90ae4801b9aca66ef8f9cda WHIRLPOOL 09f779717a401f4e36d38de2cfd07e6228167fcb69ece26803ed3917e64a70502027d0b7ac3997bea9cfffb4e5bee24381e24cf257f3ad8521d5e0f611324fec -MISC ChangeLog 16393 SHA256 c4a26554577cdca8b797319976c07964948f130c8f00fd8fb449053091fe11ea SHA512 8164411d5e4ce7f9a5189baf6d54875b444434d3ff7e5e4d780d94542fe9226a4e869a4b9a031d7f546c9b11bb5d7113e95fffc9b12065c222cd4946407bbb1b WHIRLPOOL 816884945be28eaec22d944b514d96c0f0653f6f607cbe3d2c71b2be1b11852c2c68e9f25742ced0ea1f7d49a06eb0bb5302b3c8763b26f65edb85d56ebb0c04 +EBUILD gitlab-ce-9999.ebuild 12949 SHA256 29d8125cbb7bd6d80623f54e1de2c18f7fde2301f5b94238853e2d717f920ad8 SHA512 c537716f9288e09c79508db89d21641424e36f491914aef8102734e8edd12a239f0b839d1ecfdaaf28b6bd19dd324479da3478db74611f97d875b6d5156cbac9 WHIRLPOOL 0a8403ad5f4284e5ec742eec5b6b83124f4a218adacee63cd413e3889934d1511f229d42502d50977cb2b9881f86c0e73e57c4a5421b119c5c44f56f9f8f3a92 +MISC ChangeLog 16689 SHA256 2d5d8b27ed34fa65b56108d2376b4bab7bf363831ade050675139e59b3b41652 SHA512 c2e27a088aa56a1a0cd0697449676b265eb43cd6b914c01913bc747384aa7dfa4ef90499333e257282d8c500cd1fc7e9bcfe85aed381dda315db17fe849f52b2 WHIRLPOOL 80c5160dc809f4f71a9c8c09a34ab5e69947889afce6d965969309b1a5e14de935521f4e277dfcc4e5c7a7abf37793d365ba537e9cc699f94152c5801f928dbf MISC metadata.xml 665 SHA256 2a0cd67ad42f0cc6d8b88391cf6e3153a9883dab31aae8227c57c95f3f68890d SHA512 64b8fbae373d0a057f705f64c1d097dbfab893bd585e1db65ccdb06cda9569211c9b63fa168ac8de9f6d512a17759ecd20b54d818d2790a6f4c99d0ca73fddc3 WHIRLPOOL a81b21bb46aad9757a502628033eba546c686b83bbf1d651ecabba273c454cfb64574affc180db8358ced87eb638e8ad13d7c79c4cfb9a31e72c577d21ab433e diff --git a/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild index b2ee0a3..cab2e3a 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild @@ -286,6 +286,11 @@ pkg_postinst() { elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;" elog "For details, see the documentation at the GitLab website." fi + if use mysql ; then + ewarn "PLEASE also read this document about needed migrations on MySQL:" + ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" + ewarn "Failing to follow those instructions may make the config phase fail!" + fi } pkg_config() { @@ -373,10 +378,6 @@ pkg_config() { ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" ewarn "for any additional migration tasks specific to your previous GitLab" ewarn "version." - if use mysql ; then - ewarn "PLEASE also read this document about needed migrations on MySQL:" - ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" - fi fi elog elog "If you want to make sure that the install/upgrade was successful, start" diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild index 0bc9693..bd03211 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild @@ -290,6 +290,11 @@ pkg_postinst() { elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;" elog "For details, see the documentation at the GitLab website." fi + if use mysql ; then + ewarn "PLEASE also read this document about needed migrations on MySQL:" + ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" + ewarn "Failing to follow those instructions may make the config phase fail!" + fi } pkg_config() { @@ -377,10 +382,6 @@ pkg_config() { ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" ewarn "for any additional migration tasks specific to your previous GitLab" ewarn "version." - if use mysql ; then - ewarn "PLEASE also read this document about needed migrations on MySQL:" - ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" - fi fi elog elog "If you want to make sure that the install/upgrade was successful, start"