Skip to content

Commit d41b215

Browse files
committed
updates debhelp compat to 12 from 13 and removes ashift arg from zpool_add func
1 parent 784adcd commit d41b215

4 files changed

Lines changed: 4 additions & 5 deletions

File tree

libzfs.pyx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3129,10 +3129,9 @@ cdef class ZFSPool(object):
31293129
cdef const char *command = 'zpool add'
31303130
cdef ZFSVdev vd = self.root.make_vdev_tree(vdevs_tree, {'ashift': self.properties['ashift'].parsed})
31313131
cdef int ret
3132-
cdef boolean_t ashift = check_ashift
31333132

31343133
with nogil:
3135-
ret = libzfs.zpool_add(self.handle, vd.nvlist.handle, ashift)
3134+
ret = libzfs.zpool_add(self.handle, vd.nvlist.handle)
31363135

31373136
if ret != 0:
31383137
raise self.root.get_error()
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0 (native)
1+
3.0 (quilt)

packaging/ubuntu-focal/control.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: {{ name }}
22
Section: utils
33
Priority: optional
44
Maintainer: {{ author }}
5-
Build-Depends: debhelper-compat (= 13), python3-all, python3-setuptools, dh-python
5+
Build-Depends: debhelper-compat (= 12), python3-all, python3-setuptools, dh-python
66
Standards-Version: 4.4.1
77
X-Python3-Version: >= 3.6
88
Homepage: {{ git_url }}

pxd/libzfs.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ cdef extern from "libzfs.h" nogil:
201201
extern int zpool_create(libzfs_handle_t *, const char *, nvpair.nvlist_t *,
202202
nvpair.nvlist_t *, nvpair.nvlist_t *)
203203
extern int zpool_destroy(zpool_handle_t *, const char *)
204-
extern int zpool_add(zpool_handle_t *, nvpair.nvlist_t *, boolean_t)
204+
extern int zpool_add(zpool_handle_t *, nvpair.nvlist_t *)
205205

206206
IF HAVE_ZPOOL_SCAN == 3:
207207
extern int zpool_scan(zpool_handle_t *, zfs.pool_scan_func_t, zfs.pool_scrub_cmd_t)

0 commit comments

Comments
 (0)