Browse code
fix tdnf quiet patch
Change-Id: I2e3744873b96aeb7bf46cb24c92e51572c3cb58a
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3316
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Bo Gan <ganb@vmware.com>
Priyesh Padmavilasom authored on 2017/07/22 09:00:03Showing 2 changed files
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: dnf/yum equivalent using C libs |
| 5 | 5 |
Name: tdnf |
| 6 | 6 |
Version: 1.2.1 |
| 7 |
-Release: 1%{?dist}
|
|
| 7 |
+Release: 2%{?dist}
|
|
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
License: LGPLv2.1,GPLv2 |
| ... | ... |
@@ -20,6 +20,7 @@ BuildRequires: openssl-devel |
| 20 | 20 |
BuildRequires: libsolv-devel |
| 21 | 21 |
BuildRequires: curl-devel |
| 22 | 22 |
Source0: %{name}-%{version}.tar.gz
|
| 23 |
+Patch0: tdnf_quiet_repo_refresh.patch |
|
| 23 | 24 |
%define sha1 tdnf=ebbed639c68316e5a152b0bd277c1b040ee6871f |
| 24 | 25 |
Source1: cache-updateinfo |
| 25 | 26 |
Source2: cache-updateinfo.service |
| ... | ... |
@@ -48,6 +49,7 @@ Library providing cli libs for tdnf like clients. |
| 48 | 48 |
|
| 49 | 49 |
%prep |
| 50 | 50 |
%setup -q |
| 51 |
+%patch0 -p1 |
|
| 51 | 52 |
|
| 52 | 53 |
|
| 53 | 54 |
%build |
| ... | ... |
@@ -148,6 +150,8 @@ systemctl try-restart tdnf-cache-updateinfo.timer >/dev/null 2>&1 || : |
| 148 | 148 |
%{_libdir}/libtdnfcli.so.*
|
| 149 | 149 |
|
| 150 | 150 |
%changelog |
| 151 |
+* Fri Jul 21 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.1-2 |
|
| 152 |
+- Modify quiet patch. |
|
| 151 | 153 |
* Tue Jul 18 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.1-1 |
| 152 | 154 |
- Update to v1.2.1 |
| 153 | 155 |
* Tue May 30 2017 Bo Gan <ganb@vmware.com> 1.2.0-5 |
| ... | ... |
@@ -1,5 +1,5 @@ |
| 1 | 1 |
diff --git a/client/init.c b/client/init.c |
| 2 |
-index 0269446..dc765e4 100644 |
|
| 2 |
+index b7e88ff..417b995 100644 |
|
| 3 | 3 |
--- a/client/init.c |
| 4 | 4 |
+++ b/client/init.c |
| 5 | 5 |
@@ -284,9 +284,12 @@ TDNFRefreshRepo( |
| ... | ... |
@@ -18,34 +18,16 @@ index 0269446..dc765e4 100644 |
| 18 | 18 |
dwError = TDNFRepoRemoveCache(pTdnf, pRepo->pszId); |
| 19 | 19 |
if(dwError == ERROR_TDNF_FILE_NOT_FOUND) |
| 20 | 20 |
{
|
| 21 |
-diff --git a/client/repo.c b/client/repo.c |
|
| 22 |
-index 5f0acdb..0f0baa1 100644 |
|
| 23 |
-+++ b/client/repo.c |
|
| 24 |
-@@ -339,7 +339,7 @@ TDNFGetRepoMD( |
|
| 25 |
- pRepoData->pszId, |
|
| 26 |
- pszRepoMDUrl, |
|
| 27 |
- pszRepoMDFile, |
|
| 28 |
-- pRepoData->pszId); |
|
| 29 |
-+ pTdnf->pArgs->nQuiet ? NULL : pRepoData->pszId); |
|
| 30 |
- BAIL_ON_TDNF_ERROR(dwError); |
|
| 31 |
- } |
|
| 32 |
- |
|
| 33 |
-@@ -418,7 +418,7 @@ TDNFEnsureRepoMDParts( |
|
| 34 |
- pRepoMDRel->pszRepo, |
|
| 35 |
- pszTempUrl, |
|
| 36 |
- pRepoMD->pszPrimary, |
|
| 37 |
-- pRepoMDRel->pszRepo); |
|
| 38 |
-+ pTdnf->pArgs->nQuiet ? NULL : pRepoMDRel->pszRepo); |
|
| 39 |
- BAIL_ON_TDNF_ERROR(dwError); |
|
| 40 |
- } |
|
| 21 |
+diff --git a/client/remoterepo.c b/client/remoterepo.c |
|
| 22 |
+index 12b4d2d..946aafd 100644 |
|
| 23 |
+--- a/client/remoterepo.c |
|
| 24 |
+@@ -137,7 +137,7 @@ TDNFDownloadFile( |
|
| 25 |
+ dwError = curl_easy_setopt(pCurl, CURLOPT_FOLLOWLOCATION, 1L); |
|
| 26 |
+ BAIL_ON_TDNF_CURL_ERROR(dwError); |
|
| 41 | 27 |
|
| 42 |
-@@ -447,7 +447,7 @@ TDNFEnsureRepoMDParts( |
|
| 43 |
- pRepoMDRel->pszRepo, |
|
| 44 |
- pszTempUrl, |
|
| 45 |
- pRepoMD->pszFileLists, |
|
| 46 |
-- pRepoMDRel->pszRepo); |
|
| 47 |
-+ pTdnf->pArgs->nQuiet ? NULL : pRepoMDRel->pszRepo); |
|
| 28 |
+- if(pszProgressData) |
|
| 29 |
++ if(!pTdnf->pArgs->nQuiet && pszProgressData) |
|
| 30 |
+ {
|
|
| 31 |
+ dwError = set_progress_cb(pCurl, pszProgressData); |
|
| 48 | 32 |
BAIL_ON_TDNF_ERROR(dwError); |
| 49 |
- } |
|
| 50 |
- *ppRepoMD = pRepoMD; |