代码拉取完成,页面将自动刷新
同步操作将从 OpenCloudOS Stream/anaconda 强制同步,此操作会覆盖自 Fork 仓库以来所做的任何修改,且无法恢复!!!
确定后同步将在后台操作,完成时将刷新页面,请耐心等待。
diff -purN anaconda-38.23.2.orig/pyanaconda/modules/timezone/installation.py anaconda-38.23.2/pyanaconda/modules/timezone/installation.py
--- anaconda-38.23.2.orig/pyanaconda/modules/timezone/installation.py 2023-08-22 08:32:49.486396832 +0000
+++ anaconda-38.23.2/pyanaconda/modules/timezone/installation.py 2023-08-22 08:32:55.001445237 +0000
@@ -96,8 +96,8 @@ class ConfigureTimezoneTask(Task):
if not is_valid_timezone(self._timezone):
# this should never happen, but for pity's sake
log.warning("Timezone %s set in kickstart is not valid, "
- "falling back to default (America/New_York).", self._timezone)
- self._timezone = "America/New_York"
+ "falling back to default (Asia/Beijing).", self._timezone)
+ self._timezone = "Asia/Beijing"
def _make_timezone_symlink(self):
"""Create the symlink that actually defines timezone."""
diff -purN anaconda-38.23.2.orig/pyanaconda/modules/timezone/timezone.py anaconda-38.23.2/pyanaconda/modules/timezone/timezone.py
--- anaconda-38.23.2.orig/pyanaconda/modules/timezone/timezone.py 2023-08-22 08:32:49.486396832 +0000
+++ anaconda-38.23.2/pyanaconda/modules/timezone/timezone.py 2023-08-22 08:32:55.003445254 +0000
@@ -46,7 +46,7 @@ class TimezoneService(KickstartService):
def __init__(self):
super().__init__()
self.timezone_changed = Signal()
- self._timezone = "America/New_York"
+ self._timezone = "Asia/Beijing"
self.geolocation_result_changed = Signal()
self._geoloc_result = GeolocationData()
diff -purN anaconda-38.23.2.orig/pyanaconda/ui/gui/spokes/datetime_spoke.py anaconda-38.23.2/pyanaconda/ui/gui/spokes/datetime_spoke.py
--- anaconda-38.23.2.orig/pyanaconda/ui/gui/spokes/datetime_spoke.py 2023-08-22 08:32:49.495396912 +0000
+++ anaconda-38.23.2/pyanaconda/ui/gui/spokes/datetime_spoke.py 2023-08-22 08:32:54.997445202 +0000
@@ -58,7 +58,7 @@ log = get_module_logger(__name__)
__all__ = ["DatetimeSpoke"]
-DEFAULT_TZ = "America/New_York"
+DEFAULT_TZ = "Asia/Beijing"
SPLIT_NUMBER_SUFFIX_RE = re.compile(r'([^0-9]*)([-+])([0-9]+)')
diff -purN anaconda-38.23.2.orig/tests/unit_tests/pyanaconda_tests/modules/timezone/test_module_timezone.py anaconda-38.23.2/tests/unit_tests/pyanaconda_tests/modules/timezone/test_module_timezone.py
--- anaconda-38.23.2.orig/tests/unit_tests/pyanaconda_tests/modules/timezone/test_module_timezone.py 2023-08-22 08:32:49.499396947 +0000
+++ anaconda-38.23.2/tests/unit_tests/pyanaconda_tests/modules/timezone/test_module_timezone.py 2023-08-22 08:32:54.994445175 +0000
@@ -107,7 +107,7 @@ class TimezoneInterfaceTestCase(unittest
ks_in = None
ks_out = """
# System timezone
- timezone America/New_York
+ timezone Asia/Beijing
"""
self._test_kickstart(ks_in, ks_out)
@@ -254,7 +254,7 @@ class TimezoneInterfaceTestCase(unittest
assert obj.implementation._is_utc is False
# ConfigureTimezoneTask
obj = task_objs[1]
- assert obj.implementation._timezone == "America/New_York"
+ assert obj.implementation._timezone == "Asia/Beijing"
assert obj.implementation._is_utc is False
# ConfigureNTPTask
obj = task_objs[2]
diff -purN anaconda-38.23.2.orig/tests/unit_tests/pyanaconda_tests/modules/timezone/test_timezone_tasks.py anaconda-38.23.2/tests/unit_tests/pyanaconda_tests/modules/timezone/test_timezone_tasks.py
--- anaconda-38.23.2.orig/tests/unit_tests/pyanaconda_tests/modules/timezone/test_timezone_tasks.py 2023-08-22 08:32:49.499396947 +0000
+++ anaconda-38.23.2/tests/unit_tests/pyanaconda_tests/modules/timezone/test_timezone_tasks.py 2023-08-22 08:32:54.991445149 +0000
@@ -78,7 +78,7 @@ class TimezoneTasksTestCase(unittest.Tes
input_isutc=True,
make_adjtime=True,
make_zoneinfo=True,
- expected_symlink="../usr/share/zoneinfo/America/New_York",
+ expected_symlink="../usr/share/zoneinfo/Asia/Beijing",
expected_adjtime_last_line="UTC"
)
self._test_timezone_inputs(
@@ -86,7 +86,7 @@ class TimezoneTasksTestCase(unittest.Tes
input_isutc=True,
make_adjtime=True,
make_zoneinfo=True,
- expected_symlink="../usr/share/zoneinfo/America/New_York",
+ expected_symlink="../usr/share/zoneinfo/Asia/Beijing",
expected_adjtime_last_line="UTC"
)
self._test_timezone_inputs(
@@ -94,7 +94,7 @@ class TimezoneTasksTestCase(unittest.Tes
input_isutc=True,
make_adjtime=True,
make_zoneinfo=True,
- expected_symlink="../usr/share/zoneinfo/America/New_York",
+ expected_symlink="../usr/share/zoneinfo/Asia/Beijing",
expected_adjtime_last_line="UTC"
)
diff -purN anaconda-38.23.2.orig/tests/unit_tests/pyanaconda_tests/test_localization.py anaconda-38.23.2/tests/unit_tests/pyanaconda_tests/test_localization.py
--- anaconda-38.23.2.orig/tests/unit_tests/pyanaconda_tests/test_localization.py 2023-08-22 08:32:49.501396964 +0000
+++ anaconda-38.23.2/tests/unit_tests/pyanaconda_tests/test_localization.py 2023-08-22 08:32:54.976445017 +0000
@@ -95,7 +95,7 @@ class LangcodeLocaleParsingTests(unittes
assert "Evropa/Praha" == localization.get_xlated_timezone("Europe/Prague")
localization.os.environ["LANG"] = "blah"
with pytest.raises(localization.InvalidLocaleSpec):
- localization.get_xlated_timezone("America/New_York")
+ localization.get_xlated_timezone("Asia/Beijing")
class SetupLocaleTest(unittest.TestCase):
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。