From 80d786391e9a6d18ca496ed760097b0c424b2f50 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Thu, 12 Sep 2013 00:16:27 +0200 Subject: www-apps/phabricator: hook-02-storage-upgrade: test database connection using 'database' instead of 'status' that return 1 if database is not initialized Package-Manager: portage-2.2.2 --- www-apps/phabricator/ChangeLog | 5 +++++ www-apps/phabricator/Manifest | 4 ++-- www-apps/phabricator/files/hook-02-storage-upgrade | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'www-apps') diff --git a/www-apps/phabricator/ChangeLog b/www-apps/phabricator/ChangeLog index 7a847cf9..98be4fae 100644 --- a/www-apps/phabricator/ChangeLog +++ b/www-apps/phabricator/ChangeLog @@ -1,3 +1,8 @@ + 11 Sep 2013; Bertrand Jacquin + files/hook-02-storage-upgrade: + www-apps/phabricator: hook-02-storage-upgrade: test database connection using + 'database' instead of 'status' that return 1 if database is not initialized + 11 Sep 2013; Bertrand Jacquin files/aphlictd.initd, files/phd.initd: www-apps/phabricator: if pid file or pid file is not define in configuration diff --git a/www-apps/phabricator/Manifest b/www-apps/phabricator/Manifest index e384a8eb..aca63782 100644 --- a/www-apps/phabricator/Manifest +++ b/www-apps/phabricator/Manifest @@ -3,9 +3,9 @@ AUX 0002-Make-wiki-visible-to-all.patch 907 SHA256 8f145e199490c559b11865b90b694 AUX aphlictd.confd 163 SHA256 553f18f54bcf75eada649e564fea7c4c610fd01ec93708bd246263405e7d5246 WHIRLPOOL 027e41cff147fbf7544ba72575fa21e12a66da7b5cd1bdf53a98b929b7c6127c25a997118e9cfea0e00379a7937eb52b051deb4256abb5bb5d6796a9d16138ad AUX aphlictd.initd 1049 SHA256 6f45d4e4d2d55b50b35b84c11c73628c067f5b7e4d6d88e148ebd00a1a1208cd WHIRLPOOL 2dcf7c230891e660f6dd3655ef0f04be74798f7fc98cc6191088d90ceeb7b6fe51d36ea016d625c18325f4b724a89f07b8e6c2bfd0aa6779946fe72b1702f95d AUX hook-01-perms 647 SHA256 557ccec2af3003f7d4d1bce8104f0619de1657743a3c453021ed4643db368278 WHIRLPOOL 19f8de21e0d3a5cd754e4ede5c4462112d8c0233efcd07b1ffa360fdc78c0527d74abd84a3713d736fa1ed4b889ed61cd747a1f1b2731549d0315834deeed0c6 -AUX hook-02-storage-upgrade 2179 SHA256 ab053bacb55ab34f8e832abb9b6b7254367ceed9f422955046e2930ac17af6f6 WHIRLPOOL 70a1355254cfbde014d825768f814db41a780014966fb931513d2547e6cbe9413c83e6f37699ba00385735831512e5cc2732f562c05df1425874175640f6250a +AUX hook-02-storage-upgrade 2182 SHA256 569948107d0bb082f740be5d46830fc594f793cf946bb92e22d6a5a9944da807 WHIRLPOOL 9ca93c052bc6cd719f66e6f5b86965fd54efd0fa0cfb6fc1fde93c15a8ef50b9b8f0b6bce17205e9df9040f32adbe79294a976f42ea0a25b347af034ec8a1ceb AUX phd.confd 215 SHA256 80ddbf586f38cc600d06e524f7e85c3258bd563696fa2e41e1ea19268da8079b WHIRLPOOL 0f1a587c755994c410b62da6b897ca8684d584b9f01956359e078429fc7ec7642561dc3e3c306bbb24753e3a68ef5f088a5709706143b6154aa085ac2dfa52ad AUX phd.initd 2108 SHA256 8475c308320ce4d51d35cbea46df61628c9c1d64eb724955a38ed49e51690cda WHIRLPOOL 4c91fcce779d423fa0fa24e744675a7dfaa57d0fe2dd86792a2c27215fc014ca85b38695909f8f6c063308a10d53c499620d909ee29382aec8097c437857988e EBUILD phabricator-9999.ebuild 4363 SHA256 9293b2c6b33e4f0a5f83ba814540393692feacfb4824a48eaeed38a921e35732 WHIRLPOOL 99be1029a16003d0dacaa5c192420978c68dd95c523470939c755ef42c1d419c7cd613888d6484127e4c5efc58ea47a89114c42c38c3e00ee98e381801e725ef -MISC ChangeLog 3733 SHA256 8235e7dca793d2e571d57e2bbd2a2505c40f8209c8db5f25cbf3ce6f0a9dcf1e WHIRLPOOL f01e7844d531e32bfe2655a508da079f95150305ad6e05b340c9a0c064b02e56d941900b4441ba2f0804223105a4bbcb316267c8e0938490ad98330f7153328c +MISC ChangeLog 3978 SHA256 bebbb24a9bf9cf406a9a9c19fd1e2bf28f482ad1b514750ec620488d860ece84 WHIRLPOOL 3c860b063f7e3682bce39f6704c10884777b2376efc707677f39c216758891cfff4b665f8164636e5d69ce7429a4281716fe7a776dd038ee09461fbdc95e555e MISC metadata.xml 653 SHA256 744c67bfd3b874f305b08a5b68c5e2213c3cdc1c47b381fe130ebfc2005a964b WHIRLPOOL 5efd225c032e0704862510f166c94327460caf27527b473fe8f35ea6117b2b16862e362aff0b7bdb47b38349dbcf8710fff4040f11d50e07865f983dacc93d99 diff --git a/www-apps/phabricator/files/hook-02-storage-upgrade b/www-apps/phabricator/files/hook-02-storage-upgrade index fa086433..e5e9f301 100755 --- a/www-apps/phabricator/files/hook-02-storage-upgrade +++ b/www-apps/phabricator/files/hook-02-storage-upgrade @@ -22,7 +22,7 @@ function do_install () { local _has_server=no # Do not upgrade anything if we can't connect to databases - if ! "${VHOST_ROOT}/bin/storage" status > /dev/null ; then + if ! "${VHOST_ROOT}/bin/storage" databases > /dev/null ; then ewarn "Aborting, connection to database unsuccessfull" ewarn "You need to manually run" ewarn " ${VHOST_ROOT}/bin/storage upgrade" -- cgit v1.2.3