Skip to content

Commit fb924f8

Browse files
authored
Merge pull request #517 from oliverkurth/stable-3.5
fix for SRPM install and bump to 3.5.11
2 parents 6542f98 + 2aaf925 commit fb924f8

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
CMAKE_MINIMUM_REQUIRED(VERSION 3.0 FATAL_ERROR)
1010

11-
project(tdnf VERSION 3.5.10 LANGUAGES C)
11+
project(tdnf VERSION 3.5.11 LANGUAGES C)
1212
set(VERSION ${PROJECT_VERSION})
1313
set(PROJECT_YEAR 2024)
1414

client/packageutils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ TDNFAddPackagesForInstall(
678678
&dwInstallPackage);
679679
BAIL_ON_TDNF_ERROR(dwError);
680680

681-
if(dwInstallPackage == 1)
681+
if(dwInstallPackage == 1 || nSource)
682682
{
683683
queue_push(pQueueGoal, dwHighestAvailable);
684684
}

pytests/tests/test_srpms.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,19 @@ def test_install_srpm_file_with_source_option(utils):
6565
assert len(glob.glob(os.path.join(RPMBUILD_DIR, 'SPECS', '*.spec'))) > 0
6666

6767

68+
# test srpm install if binary is installed (issue #515)
69+
def test_install_srpm_binary_isinstalled(utils):
70+
pkgname = utils.config["mulversion_pkgname"]
71+
utils.erase_package(pkgname)
72+
73+
ret = utils.run(['tdnf', 'install', '-y', '--nogpgcheck', pkgname])
74+
assert ret['retval'] == 0
75+
ret = utils.run(['tdnf', 'install', '--repoid=photon-test-src', '-y', '--source', '--nogpgcheck', pkgname])
76+
assert ret['retval'] == 0
77+
78+
assert len(glob.glob(os.path.join(RPMBUILD_DIR, 'SPECS', '*.spec'))) > 0
79+
80+
6881
# fail if trying to install an rpm with --source option
6982
def test_install_rpm_file_with_source_option(utils):
7083
pkgname = utils.config["sglversion_pkgname"]

0 commit comments

Comments
 (0)