Browse code
apply patch for quiet repo refreshes
Change-Id: Id924f0725a16a2eeea3fed12f98b5f97922bbd6a
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2676
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Bo Gan <ganb@vmware.com>
Priyesh Padmavilasom authored on 2017/05/14 02:44:14Showing 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.0 |
| 7 |
-Release: 3%{?dist}
|
|
| 7 |
+Release: 4%{?dist}
|
|
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
License: LGPLv2.1,GPLv2 |
| ... | ... |
@@ -21,6 +21,7 @@ BuildRequires: libsolv-devel |
| 21 | 21 |
BuildRequires: curl-devel |
| 22 | 22 |
Source0: %{name}-%{version}.tar.gz
|
| 23 | 23 |
Patch0: hy_sack_create.patch |
| 24 |
+Patch1: tdnf_quiet_repo_refresh.patch |
|
| 24 | 25 |
%define sha1 tdnf=56deeb1e89177a4aadfac1ebb85b7c09a452a79e |
| 25 | 26 |
Source1: cache-updateinfo |
| 26 | 27 |
Source2: cache-updateinfo.service |
| ... | ... |
@@ -50,6 +51,8 @@ Library providing cli libs for tdnf like clients. |
| 50 | 50 |
%prep |
| 51 | 51 |
%setup -q |
| 52 | 52 |
%patch0 -p1 |
| 53 |
+%patch1 -p1 |
|
| 54 |
+ |
|
| 53 | 55 |
|
| 54 | 56 |
%build |
| 55 | 57 |
autoreconf -i |
| ... | ... |
@@ -148,6 +151,8 @@ systemctl try-restart tdnf-cache-updateinfo.timer >/dev/null 2>&1 || : |
| 148 | 148 |
%{_libdir}/libtdnfcli.so.*
|
| 149 | 149 |
|
| 150 | 150 |
%changelog |
| 151 |
+* Fri May 12 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.0-4 |
|
| 152 |
+- Patch repo refresh to allow quiet flags |
|
| 151 | 153 |
* Wed May 10 2017 Bo Gan <ganb@vmware.com> 1.2.0-3 |
| 152 | 154 |
- Fix cache-updateinfo script |
| 153 | 155 |
* Fri May 05 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.0-2 |
| 154 | 156 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,51 @@ |
| 0 |
+diff --git a/client/init.c b/client/init.c |
|
| 1 |
+index 0269446..dc765e4 100644 |
|
| 2 |
+--- a/client/init.c |
|
| 3 |
+@@ -284,9 +284,12 @@ TDNFRefreshRepo( |
|
| 4 |
+ |
|
| 5 |
+ if(nCleanMetadata || nMetadataExpired) |
|
| 6 |
+ {
|
|
| 7 |
+- fprintf(stdout, |
|
| 8 |
+- "Refreshing metadata for: '%s'\n", |
|
| 9 |
+- pRepo->pszName); |
|
| 10 |
++ if(!pTdnf->pArgs->nQuiet) |
|
| 11 |
++ {
|
|
| 12 |
++ fprintf(stdout, |
|
| 13 |
++ "Refreshing metadata for: '%s'\n", |
|
| 14 |
++ pRepo->pszName); |
|
| 15 |
++ } |
|
| 16 |
+ dwError = TDNFRepoRemoveCache(pTdnf, pRepo->pszId); |
|
| 17 |
+ if(dwError == ERROR_TDNF_FILE_NOT_FOUND) |
|
| 18 |
+ {
|
|
| 19 |
+diff --git a/client/repo.c b/client/repo.c |
|
| 20 |
+index 5f0acdb..0f0baa1 100644 |
|
| 21 |
+--- a/client/repo.c |
|
| 22 |
+@@ -339,7 +339,7 @@ TDNFGetRepoMD( |
|
| 23 |
+ pRepoData->pszId, |
|
| 24 |
+ pszRepoMDUrl, |
|
| 25 |
+ pszRepoMDFile, |
|
| 26 |
+- pRepoData->pszId); |
|
| 27 |
++ pTdnf->pArgs->nQuiet ? NULL : pRepoData->pszId); |
|
| 28 |
+ BAIL_ON_TDNF_ERROR(dwError); |
|
| 29 |
+ } |
|
| 30 |
+ |
|
| 31 |
+@@ -418,7 +418,7 @@ TDNFEnsureRepoMDParts( |
|
| 32 |
+ pRepoMDRel->pszRepo, |
|
| 33 |
+ pszTempUrl, |
|
| 34 |
+ pRepoMD->pszPrimary, |
|
| 35 |
+- pRepoMDRel->pszRepo); |
|
| 36 |
++ pTdnf->pArgs->nQuiet ? NULL : pRepoMDRel->pszRepo); |
|
| 37 |
+ BAIL_ON_TDNF_ERROR(dwError); |
|
| 38 |
+ } |
|
| 39 |
+ |
|
| 40 |
+@@ -447,7 +447,7 @@ TDNFEnsureRepoMDParts( |
|
| 41 |
+ pRepoMDRel->pszRepo, |
|
| 42 |
+ pszTempUrl, |
|
| 43 |
+ pRepoMD->pszFileLists, |
|
| 44 |
+- pRepoMDRel->pszRepo); |
|
| 45 |
++ pTdnf->pArgs->nQuiet ? NULL : pRepoMDRel->pszRepo); |
|
| 46 |
+ BAIL_ON_TDNF_ERROR(dwError); |
|
| 47 |
+ } |
|
| 48 |
+ *ppRepoMD = pRepoMD; |