--- a/doc/pyalpm/Package.rst +++ b/doc/pyalpm/Package.rst @@ -35,10 +35,6 @@ Packages A list of licenses for this package. - .. py:attribute:: deltas (list) - - A list of deltas for this package - .. py:attribute:: desc (string) Package description. only in patch2: unchanged: --- a/pycman/config.py +++ b/pycman/config.py @@ -68,13 +68,11 @@ SINGLE_OPTIONS = ( 'SigLevel', 'LocalFileSigLevel', 'RemoteFileSigLevel', - 'UseDelta', ) BOOLEAN_OPTIONS = ( 'UseSyslog', 'ShowSize', - 'UseDelta', 'TotalDownload', 'CheckSpace', 'VerbosePkgLists', only in patch2: unchanged: --- a/src/handle.c +++ b/src/handle.c @@ -250,11 +250,7 @@ struct PyGetSetDef pyalpm_handle_getset[] = { (getter)option_get_usesyslog_alpm, (setter)option_set_usesyslog_alpm, "use syslog (an integer, 0 = False, 1 = True)", NULL } , - { "deltaratio", - (getter)option_get_deltaratio_alpm, - (setter)option_set_deltaratio_alpm, - "set deltaratio (a float). Deltas are enabled if this is nonzero.", NULL } , - { "checkspace", + { "checkspace", (getter)option_get_checkspace_alpm, (setter)option_set_checkspace_alpm, "check disk space before transactions (an integer, 0 = False, 1 = True)", NULL } , only in patch2: unchanged: --- a/src/options.c +++ b/src/options.c @@ -68,28 +68,6 @@ int option_set_usesyslog_alpm(PyObject *self, PyObject *value, void* closure) return 0; } -PyObject* option_get_deltaratio_alpm(PyObject *self, void* closure) { - alpm_handle_t *handle = ALPM_HANDLE(self); - double ret = alpm_option_get_deltaratio(handle); - if (ret == -1) { - RET_ERR("failed getting deltaratio", alpm_errno(handle), NULL); - } else - return PyFloat_FromDouble(ret); -} - -int option_set_deltaratio_alpm(PyObject *self, PyObject *value, void* closure) -{ - alpm_handle_t *handle = ALPM_HANDLE(self); - double fval = PyFloat_AsDouble(value); - - if(PyErr_Occurred()) { - return -1; - } - - alpm_option_set_deltaratio(handle, fval); - return 0; -} - PyObject* option_get_checkspace_alpm(PyObject *self, void* closure) { alpm_handle_t *handle = ALPM_HANDLE(self); int ret = alpm_option_get_checkspace(handle); only in patch2: unchanged: --- a/src/options.h +++ b/src/options.h @@ -30,9 +30,6 @@ PyObject* option_get_usesyslog_alpm(PyObject *self, void* closure); int option_set_usesyslog_alpm(PyObject *self, PyObject *value, void* closure); -PyObject* option_get_deltaratio_alpm(PyObject *self, void* closure); -int option_set_deltaratio_alpm(PyObject *self, PyObject *value, void* closure); - PyObject* option_get_checkspace_alpm(PyObject *self, void* closure); int option_set_checkspace_alpm(PyObject *self, PyObject *value, void* closure); only in patch2: unchanged: --- a/src/package.c +++ b/src/package.c @@ -279,7 +279,6 @@ static PyObject* pyalpm_pkg_compute_requiredby(PyObject *rawself, PyObject *args struct list_getter get_licenses = { alpm_pkg_get_licenses, pyobject_from_string }; struct list_getter get_groups = { alpm_pkg_get_groups, pyobject_from_string }; struct list_getter get_backup = { alpm_pkg_get_backup, pyobject_from_alpm_backup }; -struct list_getter get_deltas = { alpm_pkg_get_deltas, pyobject_from_string }; struct list_getter get_depends = { alpm_pkg_get_depends, _pyobject_from_pmdepend }; struct list_getter get_optdepends = { alpm_pkg_get_optdepends, _pyobject_from_pmdepend }; struct list_getter get_replaces = { alpm_pkg_get_replaces, _pyobject_from_pmdepend }; @@ -310,7 +309,6 @@ static struct PyGetSetDef AlpmPackageGetSet[] = { { "installdate", (getter)pyalpm_package_get_installdate, 0, "install time", NULL } , { "files", (getter)pyalpm_package_get_files, 0, "list of installed files", NULL } , { "backup", (getter)_get_list_attribute, 0, "list of tuples (filename, md5sum)", &get_backup } , - { "deltas", (getter)_get_list_attribute, 0, "list of available deltas", &get_deltas } , /* dependency information */ { "depends", (getter)_get_list_attribute, 0, "list of dependencies", &get_depends } , { "optdepends", (getter)_get_list_attribute, 0, "list of optional dependencies", &get_optdepends } , only in patch2: unchanged: --- a/src/transaction.c +++ b/src/transaction.c @@ -106,14 +106,6 @@ void pyalpm_eventcb(alpm_event_t *event) { break; case ALPM_EVENT_LOAD_START: case ALPM_EVENT_LOAD_DONE: - case ALPM_EVENT_DELTA_INTEGRITY_START: - case ALPM_EVENT_DELTA_INTEGRITY_DONE: - case ALPM_EVENT_DELTA_PATCHES_START: - case ALPM_EVENT_DELTA_PATCHES_DONE: - case ALPM_EVENT_DELTA_PATCH_START: - /* info here */ - case ALPM_EVENT_DELTA_PATCH_DONE: - case ALPM_EVENT_DELTA_PATCH_FAILED: case ALPM_EVENT_SCRIPTLET_INFO: /* info here */ case ALPM_EVENT_RETRIEVE_START: @@ -352,9 +344,6 @@ static PyObject* pyalpm_trans_commit(PyObject *self, PyObject *args) { case ALPM_ERR_PKG_INVALID: case ALPM_ERR_PKG_INVALID_CHECKSUM: case ALPM_ERR_PKG_INVALID_SIG: - case ALPM_ERR_DLT_INVALID: - err_info = alpmlist_to_pylist(data, pyobject_from_string); - break; default: break; } only in patch2: unchanged: --- a/test/test_handle.py +++ b/test/test_handle.py @@ -85,11 +85,6 @@ def test_usesyslog_error(handle): handle.usesyslog = "nope" assert 'wrong arguments' in str(excinfo) -def test_deltaratio(handle): - assert handle.deltaratio == 0.0 - handle.deltaratio = 1 - assert handle.deltaratio == 1.0 - def test_checkspace(handle): assert not handle.checkspace handle.checkspace = True only in patch2: unchanged: --- a/test/test_package.py +++ b/test/test_package.py @@ -36,9 +36,6 @@ def test_files(package): def test_backup(package): assert package.backup == [] -def test_deltas(package): - assert package.deltas == [] - def test_depends(package): assert package.depends != []