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

prt-get: remove handling of external dependency list

Browse Source 
git-svn-id: https://crux.nu/svn/tools/prt-get/trunk@1851 0b5ae1c7-2405-0410-a7fc-ba219f786e1e
This commit is contained in:
Johannes Winkelmann 2006-09-09 13:23:07 +00:00
parent 90d05d9e51
commit 205624c78b
6 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
* 0.5.14 00.00.200x Johannes Winkelmann
- Remove handling of external dependency list
* 0.5.13 08.09.2006 Johannes Winkelmann * 0.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"

1
TODO
View File

@ -1,3 +1,4 @@
- handle 27e < 28 in version comperator
- add --rebuild-set to dependent - add --rebuild-set to dependent
- use `eval $(fgrep -h 'PKGMK_PACKAGE_DIR=' $(which pkgmk) /etc/pkgmk.conf) && echo - use `eval $(fgrep -h 'PKGMK_PACKAGE_DIR=' $(which pkgmk) /etc/pkgmk.conf) && echo
$PKGMK_PACKAGE_DIR` to determine PACKAGE_DIR $PKGMK_PACKAGE_DIR` to determine PACKAGE_DIR

2
configure vendored
View File

@ -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.13pre VERSION=5.13
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

7
src/prtget.cpp
View File

@ -2012,13 +2012,6 @@ void PrtGet::dumpConfig()
cout.fill( ' ' ); cout.fill( ' ' );
cout << "Alias file: " << PkgDB::ALIAS_STORE << endl; cout << "Alias file: " << PkgDB::ALIAS_STORE << endl;
cout.setf( ios::left, ios::adjustfield );
cout.width( 20 );
cout.fill( ' ' );
cout << "Ext. dep. file: "
<< Repository::EXTERNAL_DEPENDENCY_FILE << endl;
if (!m_parser->noStdConfig()) { if (!m_parser->noStdConfig()) {
string fName = CONF_FILE; string fName = CONF_FILE;
if ( m_parser->isAlternateConfigGiven() ) { if ( m_parser->isAlternateConfigGiven() ) {

14
src/repository.cpp
View File

@ -31,8 +31,6 @@ using namespace StringHelper;
const string Repository::CACHE_VERSION = "V5"; const string Repository::CACHE_VERSION = "V5";
const string Repository::EXTERNAL_DEPENDENCY_FILE =
LOCALSTATEDIR"/lib/pkg/prt-get.deplist";
/*! /*!
Create a repository Create a repository
@ -75,15 +73,6 @@ const list< pair<Package*, Package*> >& Repository::shadowedPackages() const
} }
void Repository::parseDependencyList()
{
map<string, string> depMap;
if (DataFileParser::parse(EXTERNAL_DEPENDENCY_FILE, depMap)) {
addDependencies(depMap);
}
}
/*! /*!
\param name the package name to be returned \param name the package name to be returned
\return a Package pointer for a package name or 0 if not found \return a Package pointer for a package name or 0 if not found
@ -244,7 +233,6 @@ void Repository::initFromFS( const list< pair<string, string> >& rootList,
} }
m_shadowedPackages.sort(compareShadowPair); m_shadowedPackages.sort(compareShadowPair);
parseDependencyList();
} }
/*! /*!
@ -299,8 +287,6 @@ Repository::initFromCache( const string& cacheFile )
} }
fclose( fp ); fclose( fp );
parseDependencyList();
return READ_OK; return READ_OK;
} }

4
src/repository.h
View File

@ -66,8 +66,6 @@ public:
static bool createOutputDir( const string& path ); static bool createOutputDir( const string& path );
void addDependencies( std::map<string, string>& deps ); void addDependencies( std::map<string, string>& deps );
static const std::string EXTERNAL_DEPENDENCY_FILE;
private: private:
static int compareShadowPair(pair<Package*, Package*>& p1, static int compareShadowPair(pair<Package*, Package*>& p1,
pair<Package*, Package*>& p2); pair<Package*, Package*>& p2);
@ -75,8 +73,6 @@ private:
static const std::string CACHE_VERSION; static const std::string CACHE_VERSION;
bool m_useRegex; bool m_useRegex;
void parseDependencyList();
list<pair<Package*, Package*> > m_shadowedPackages; list<pair<Package*, Package*> > m_shadowedPackages;
map<string, Package*> m_packageMap; map<string, Package*> m_packageMap;
}; };