packages/python-blivet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!146 [sync] PR-144: fix anaconda partition error tip

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2024-12-05 02:04:48 +00:00 committed by Gitee
commit 815b32bfd7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Incomplete-Chineseization-of-disk-mount.patch
View File

@ -1,8 +1,26 @@
From 7276d3ed7a3385292eb9a250735da575e345ff99 Mon Sep 17 00:00:00 2001
From: sun_hai_10 <sunhai10@huawei.com>
Date: Wed, 4 Dec 2024 17:42:17 +0800
Subject: [PATCH] Incomplete Chineseization of disk mount
---
blivet/devicefactory.py | 9 +++++----
po/zh_CN.po | 4 ++++
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py
index b995cc2..ca816fc 100644 index b995cc2..a9b1f1a 100644
--- a/blivet/devicefactory.py --- a/blivet/devicefactory.py
+++ b/blivet/devicefactory.py +++ b/blivet/devicefactory.py
@@ -724,7 +724,7 @@ class DeviceFactory(object): @@ -41,6 +41,7 @@ from .partitioning import TotalSizeSet
from .partitioning import do_partitioning
from .size import Size
from .static_data import luks_data
+from .i18n import _
import gi
gi.require_version("BlockDev", "3.0")
@@ -724,7 +725,7 @@ class DeviceFactory(object):
# the container # the container
size = self._get_device_size() size = self._get_device_size()
if size <= Size(0): if size <= Size(0):
@ -11,7 +29,7 @@ index b995cc2..ca816fc 100644
parents = self._get_parent_devices() parents = self._get_parent_devices()
@@ -1348,7 +1348,7 @@ class LVMFactory(DeviceFactory): @@ -1348,7 +1349,7 @@ class LVMFactory(DeviceFactory):
self.size += self.device.size self.size += self.device.size
if self.size == Size(0): if self.size == Size(0):
@ -20,7 +38,7 @@ index b995cc2..ca816fc 100644
else: else:
super(LVMFactory, self)._handle_no_size() super(LVMFactory, self)._handle_no_size()
@@ -2119,7 +2119,7 @@ class StratisFactory(DeviceFactory): @@ -2119,7 +2120,7 @@ class StratisFactory(DeviceFactory):
self.size += self.device.size self.size += self.device.size
if self.size == Size(0): if self.size == Size(0):
@ -29,7 +47,7 @@ index b995cc2..ca816fc 100644
else: else:
super(StratisFactory, self)._handle_no_size() super(StratisFactory, self)._handle_no_size()
@@ -2170,7 +2170,7 @@ class StratisFactory(DeviceFactory): @@ -2170,7 +2171,7 @@ class StratisFactory(DeviceFactory):
# the container # the container
size = self._get_device_size() size = self._get_device_size()
if size <= Size(0): if size <= Size(0):
@ -53,3 +71,6 @@ index 5b7ac92..21309ac 100644
#: ../blivet/iscsi.py:216 #: ../blivet/iscsi.py:216
msgid "Unable to change iSCSI initiator name once set" msgid "Unable to change iSCSI initiator name once set"
msgstr "设定后就无法更改 iSCSI 启动程序名称" msgstr "设定后就无法更改 iSCSI 启动程序名称"
--
2.33.0

8
python-blivet.spec
View File

@ -3,7 +3,7 @@
Name: python-blivet Name: python-blivet
Version: 3.8.2 Version: 3.8.2
Release: 8 Release: 9
Epoch: 1 Epoch: 1
Summary: A python module for system storage configuration Summary: A python module for system storage configuration
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -130,6 +130,12 @@ make PYTHON=%{__python2} DESTDIR=%{buildroot} install
%doc README.md %doc README.md
%changelog %changelog
* Wed Dec 04 2024 sunhai<sunhai10@huawei.com> - 1:3.8.2-9
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix anaconda partition error tip
* Tue Oct 22 2024 sunhai<sunhai10@huawei.com> - 1:3.8.2-8 * Tue Oct 22 2024 sunhai<sunhai10@huawei.com> - 1:3.8.2-8
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA