prt-get: prepare for 5.14

git-svn-id: https://crux.nu/svn/tools/prt-get/trunk@1875 0b5ae1c7-2405-0410-a7fc-ba219f786e1e
This commit is contained in:
Johannes Winkelmann 2006-09-13 17:13:26 +00:00
parent 318a4a0768
commit 73dbd9babc
6 changed files with 27 additions and 19 deletions

View File

@ -1,10 +1,12 @@
* 0.5.14 00.00.200x Johannes Winkelmann * 5.14 13.09.2006 Johannes Winkelmann
- Remove handling of external dependency list - Remove handling of external dependency list
- make InstallTransaction::getPkgDest use pkgmk.conf from install-root - make InstallTransaction::getPkgDest use pkgmk.conf from install-root
- revert getPkgDest to ignore install-root - revert getPkgDest to ignore install-root
- determine PKGMK_PACKAGE_DIR using fgrep without sourcing pkgmk.conf - determine PKGMK_PACKAGE_DIR using fgrep without sourcing pkgmk.conf
- fix bug in "undecided" output of diff (thanks treach)
- fix bug in version comperator introduced in 5.13
* 0.5.13 08.09.2006 Johannes Winkelmann * 5.13 08.09.2006 Johannes Winkelmann
- Show undecided versions in diff and sysup when using "prefer higher" - Show undecided versions in diff and sysup when using "prefer higher"
- fix display bug in "dependent" - fix display bug in "dependent"
- fix bug in version comparator - fix bug in version comparator

6
configure vendored
View File

@ -742,7 +742,7 @@ pdfdir='${docdir}'
psdir='${docdir}' psdir='${docdir}'
libdir='${exec_prefix}/lib' libdir='${exec_prefix}/lib'
localedir='${datarootdir}/locale' localedir='${datarootdir}/locale'
mandir='${prefix}/man' mandir='${datarootdir}/man'
ac_prev= ac_prev=
ac_dashdash= ac_dashdash=
@ -1245,7 +1245,7 @@ Fine tuning of the installation directories:
--datadir=DIR read-only architecture-independent data [DATAROOTDIR] --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
--infodir=DIR info documentation [DATAROOTDIR/info] --infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale] --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [PREFIX/man] --mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
--htmldir=DIR html documentation [DOCDIR] --htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR]
@ -2023,7 +2023,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE=prt-get PACKAGE=prt-get
VERSION=5.13 VERSION=5.14
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

View File

@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([src/prtget.cpp]) AC_CONFIG_SRCDIR([src/prtget.cpp])
AM_INIT_AUTOMAKE(prt-get,5.14pre) AM_INIT_AUTOMAKE(prt-get,5.14)
dnl Determine default prefix dnl Determine default prefix

View File

@ -835,8 +835,8 @@ void PrtGet::printQuickDiff()
void PrtGet::printFormattedDiffLine(const string& name, void PrtGet::printFormattedDiffLine(const string& name,
const string& version1, const string& versionInstalled,
const string& version2, const string& versionPortsTree,
bool isLocked) bool isLocked)
{ {
cout.setf( ios::left, ios::adjustfield ); cout.setf( ios::left, ios::adjustfield );
@ -846,7 +846,7 @@ void PrtGet::printFormattedDiffLine(const string& name,
cout.width( 20 ); cout.width( 20 );
cout.fill( ' ' ); cout.fill( ' ' );
cout << version1; cout << versionInstalled;
string locked = ""; string locked = "";
if ( isLocked ) { if ( isLocked ) {
@ -854,7 +854,7 @@ void PrtGet::printFormattedDiffLine(const string& name,
} }
cout.width( 20 ); cout.width( 20 );
cout.fill( ' ' ); cout.fill( ' ' );
cout << version2 << locked << endl; cout << versionPortsTree << locked << endl;
} }
/*! /*!
print an overview of port which are installed in a different version print an overview of port which are installed in a different version
@ -931,7 +931,8 @@ void PrtGet::printDiff()
} }
} }
if (m_undefinedVersionComp.size()) { if (m_undefinedVersionComp.size() &&
(m_parser->all() || m_parser->verbose()) ) {
cout << "\n\n" << "Undecidable version differences (use --strict-diff)" cout << "\n\n" << "Undecidable version differences (use --strict-diff)"
<< endl << endl; << endl << endl;
printFormattedDiffLine("Port", printFormattedDiffLine("Port",
@ -946,8 +947,8 @@ void PrtGet::printDiff()
for (; it != m_undefinedVersionComp.end(); ++it) { for (; it != m_undefinedVersionComp.end(); ++it) {
p = it->first; p = it->first;
printFormattedDiffLine(p->name(), printFormattedDiffLine(p->name(),
p->versionReleaseString(),
it->second, it->second,
p->versionReleaseString(),
false); false);
} }
} }
@ -1101,9 +1102,9 @@ void PrtGet::evaluateResult( InstallTransaction& transaction,
for ( ; uit != m_undefinedVersionComp.end(); ++uit ) { for ( ; uit != m_undefinedVersionComp.end(); ++uit ) {
p = uit->first; p = uit->first;
cout << p->name() << " (" cout << p->name() << " ("
<< p->versionReleaseString() << uit->second
<< " vs " << " vs "
<< uit->second << ")" << endl; << p->versionReleaseString() << ")" << endl;
} }
} }

View File

@ -155,6 +155,7 @@ protected:
compareVersions( const string& v1, const string& v2 ); compareVersions( const string& v1, const string& v2 );
static bool printFile(const string& file); static bool printFile(const string& file);
// map package from ports tree to version currently installed
std::list< std::pair<const Package*, std::string> > m_undefinedVersionComp; std::list< std::pair<const Package*, std::string> > m_undefinedVersionComp;
}; };

View File

@ -69,7 +69,7 @@ COMP_RESULT compareVersions(const string& v1, const string& v2)
for (int k = 0; k < subTokLen; ++k) { for (int k = 0; k < subTokLen; ++k) {
long sl1 = strtol(subtokens1[k].c_str(), &error1, 10); long sl1 = strtol(subtokens1[k].c_str(), &error1, 10);
long sl2 = strtol(subtokens2[k].c_str(), &error2, 10); long sl2 = strtol(subtokens2[k].c_str(), &error2, 10);
if (!error1 && !error2) { if (*error1 == 0 && *error2 == 0) {
if (sl1 < sl2) { if (sl1 < sl2) {
return LESS; return LESS;
} else if (sl1 > sl2) { } else if (sl1 > sl2) {
@ -246,6 +246,10 @@ int main(int argc, char** argv)
check("1.4.2beta3", "1.4.2alpha2", GREATER); check("1.4.2beta3", "1.4.2alpha2", GREATER);
check("1.4.2-some", "1.4.2-1", UNDEFINED); check("1.4.2-some", "1.4.2-1", UNDEFINED);
check("1.4.2-1", "1.4.2-some", UNDEFINED); check("1.4.2-1", "1.4.2-some", UNDEFINED);
check("7.0r63-3", "7.0r68-1", LESS);
check("27", "28e", LESS);
} else { } else {
check(argv[1], argv[2], UNDEFINED, false); check(argv[1], argv[2], UNDEFINED, false);
} }