@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Correct RepositoryURI schema and propagate `adjust` exit code correctly
Summary:
Fixes T10830.
- The return code from `storage adjust` did not propagate correct.
- There was one column issue which I missed the first time around because I had a bunch of unrelated stuff locally.
Test Plan:
- Ran `bin/storage upgrade -f` with failures, used `echo $?` to make sure it exited nonzero.
- Got fully clean `bin/storage adjust` by dropping all my extra local tables.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T10830
Differential Revision: https://secure.phabricator.com/D15746
+7
-2
+2
resources/sql/autopatches/20160418.repouri.2.sql
+2
resources/sql/autopatches/20160418.repouri.2.sql
+1
src/applications/repository/storage/PhabricatorRepositoryURI.php
+1
src/applications/repository/storage/PhabricatorRepositoryURI.php
+4
-2
src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
+4
-2
src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
···
61
61
}
62
62
}
63
63
64
-
$this->didExecute($args);
64
+
return $this->didExecute($args);
65
65
}
66
66
67
67
public function didExecute(PhutilArgumentParser $args) {}
···
81
81
$lock = $this->lock();
82
82
83
83
try {
84
-
$this->doAdjustSchemata($unsafe);
84
+
$err = $this->doAdjustSchemata($unsafe);
85
85
} catch (Exception $ex) {
86
86
$lock->unlock();
87
87
throw $ex;
88
88
}
89
89
90
90
$lock->unlock();
91
+
92
+
return $err;
91
93
}
92
94
93
95
final private function doAdjustSchemata($unsafe) {