jmq/prt-get
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

respect -fr (forceRebuild) even if built package is newer than Pkgfile

Browse Source
This commit is contained in:
John McQuah 2023-09-13 12:03:07 -04:00
parent a073423a89
commit 1287e9920d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/installtransaction.cpp
View File

@ -334,7 +334,9 @@ const {
stat((portdir + "/Pkgfile").c_str(), &fstatData) == 0) { stat((portdir + "/Pkgfile").c_str(), &fstatData) == 0) {
time_t pkgMtime = statData.st_mtime; time_t pkgMtime = statData.st_mtime;
time_t pfMtime = fstatData.st_mtime; time_t pfMtime = fstatData.st_mtime;
if ( difftime(pkgMtime,pfMtime) > 0 ) { cmd = "/bin/true"; } if ( ( difftime(pkgMtime,pfMtime) > 0 ) and
(parser->pkgmkArgs().find("-fr") == string::npos) ) {
cmd = "/bin/true"; }
} }
string args = "-d " + parser->pkgmkArgs(); string args = "-d " + parser->pkgmkArgs();
@ -463,6 +465,9 @@ bool InstallTransaction::calculateDependencies()
const Package* package = it->second; const Package* package = it->second;
if ( package ) { if ( package ) {
checkDependencies( false, package ); checkDependencies( false, package );
} else {
m_missingPackages.
push_back( make_pair( it->first, string("") ) );
} }
} }
list<int> indexList; list<int> indexList;

4
src/prtget.cpp
View File

@ -950,7 +950,7 @@ void PrtGet::evaluateResult( InstallTransaction& transaction,
} }
const list<string>& already = transaction.alreadyInstalledPackages(); const list<string>& already = transaction.alreadyInstalledPackages();
if ( already.size() && ! m_parser->depSort() ) { if ( already.size() ) {
cout << endl << "-- Packages installed before this run (ignored)" cout << endl << "-- Packages installed before this run (ignored)"
<< endl; << endl;
list<string>::const_iterator ait = already.begin(); list<string>::const_iterator ait = already.begin();
@ -1034,7 +1034,7 @@ void PrtGet::evaluateResult( InstallTransaction& transaction,
cout << endl; cout << endl;
if ( errors == 0 && !interrupted ) { if ( inst.size() && errors == 0 && !interrupted ) {
cout << "prt-get: install successful." << endl; cout << "prt-get: install successful." << endl;
} else { } else {
m_returnValue = PG_PARTIAL_INSTALL_ERROR; m_returnValue = PG_PARTIAL_INSTALL_ERROR;