Config migration script bug fix
Summary: i think way back in D10490 I didn't incorporate feedback correctly. make this code right as it fatals in this codepath as is. Fixes T6508. Test Plan: @joshuaspence to the rescue (I remain unable to test this effectively with my baby-clean installation.) Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin, epriestley, joshuaspence Maniphest Tasks: T6508 Differential Revision: https://secure.phabricator.com/D10833
This commit is contained in:
		@@ -55,13 +55,14 @@ final class PhabricatorConfigManagementMigrateWorkflow
 | 
				
			|||||||
              'Skipping option "%s"; already in database config.', $key)."\n");
 | 
					              'Skipping option "%s"; already in database config.', $key)."\n");
 | 
				
			||||||
            continue;
 | 
					            continue;
 | 
				
			||||||
          } else {
 | 
					          } else {
 | 
				
			||||||
            PhabricatorConfigEditor::deleteConfig(
 | 
					            PhabricatorConfigEditor::storeNewValue(
 | 
				
			||||||
              $this->getViewer(),
 | 
					              $this->getViewer(),
 | 
				
			||||||
              $option,
 | 
					              id(new PhabricatorConfigEntry())
 | 
				
			||||||
 | 
					              ->loadOneWhere('namespace = %s AND key = %s', 'default', $key),
 | 
				
			||||||
              PhabricatorContentSource::newConsoleSource());
 | 
					              PhabricatorContentSource::newConsoleSource());
 | 
				
			||||||
            $key_count++;
 | 
					            $key_count++;
 | 
				
			||||||
            $console->writeOut(pht(
 | 
					            $console->writeOut(pht(
 | 
				
			||||||
              'Migrated option "%s" from file to local config.', $key)."\n");
 | 
					              'Migrated option "%s" from file to database config.', $key)."\n");
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user