diff options
author | Johannes Winkelmann <jw@smts.ch> | 2006-09-09 13:23:07 +0000 |
---|---|---|
committer | Johannes Winkelmann <jw@smts.ch> | 2006-09-09 13:23:07 +0000 |
commit | 205624c78b924227a7670f86999033f27238615c (patch) | |
tree | fdbddd8cfd92ce8c75d142f2753238c6f036af0b | |
parent | 90d05d9e51486912930e141f8b1af7c297a65b21 (diff) | |
download | prt-get-205624c78b924227a7670f86999033f27238615c.tar.gz prt-get-205624c78b924227a7670f86999033f27238615c.tar.xz |
prt-get: remove handling of external dependency list
git-svn-id: https://crux.nu/svn/tools/prt-get/trunk@1851 0b5ae1c7-2405-0410-a7fc-ba219f786e1e
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | TODO | 1 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | src/prtget.cpp | 9 | ||||
-rw-r--r-- | src/repository.cpp | 18 | ||||
-rw-r--r-- | src/repository.h | 6 |
6 files changed, 9 insertions, 30 deletions
@@ -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 - Show undecided versions in diff and sysup when using "prefer higher" - fix display bug in "dependent" @@ -1,3 +1,4 @@ +- handle 27e < 28 in version comperator - add --rebuild-set to dependent - use `eval $(fgrep -h 'PKGMK_PACKAGE_DIR=' $(which pkgmk) /etc/pkgmk.conf) && echo $PKGMK_PACKAGE_DIR` to determine PACKAGE_DIR @@ -2023,7 +2023,7 @@ fi # Define the identity of the package. PACKAGE=prt-get - VERSION=5.13pre + VERSION=5.13 cat >>confdefs.h <<_ACEOF diff --git a/src/prtget.cpp b/src/prtget.cpp index 01af812..340a5f1 100644 --- a/src/prtget.cpp +++ b/src/prtget.cpp @@ -271,7 +271,7 @@ void PrtGet::listShadowed() string format = "%p1 %v1 > %p2 %v2\n"; if (m_parser->otherArgs().size() > 0) format = *(m_parser->otherArgs().begin()); - else if (m_parser->verbose() > 0) + else if (m_parser->verbose() > 0) format = "* %n\n %p1 %v1 preceeds over \n %p2 %v2\n"; string output; @@ -2012,13 +2012,6 @@ void PrtGet::dumpConfig() cout.fill( ' ' ); 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()) { string fName = CONF_FILE; if ( m_parser->isAlternateConfigGiven() ) { diff --git a/src/repository.cpp b/src/repository.cpp index 789eb8e..e911095 100644 --- a/src/repository.cpp +++ b/src/repository.cpp @@ -31,8 +31,6 @@ using namespace StringHelper; const string Repository::CACHE_VERSION = "V5"; -const string Repository::EXTERNAL_DEPENDENCY_FILE = - LOCALSTATEDIR"/lib/pkg/prt-get.deplist"; /*! Create a repository @@ -64,7 +62,7 @@ const map<string, Package*>& Repository::packages() const /*! - Returns a sorted list of duplicate packages in the repository. + Returns a sorted list of duplicate packages in the repository. In the pairs \a first is the shadowed port and \a second is the port which preceeds over \a first \return a list of duplicate packages in the 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 \return a Package pointer for a package name or 0 if not found @@ -140,7 +129,7 @@ void Repository::searchMatchingPackages( const string& pattern, } } -int Repository::compareShadowPair(pair<Package*, Package*>& p1, +int Repository::compareShadowPair(pair<Package*, Package*>& p1, pair<Package*, Package*>& p2) { return p1.second->name() < p2.second->name(); @@ -244,7 +233,6 @@ void Repository::initFromFS( const list< pair<string, string> >& rootList, } m_shadowedPackages.sort(compareShadowPair); - parseDependencyList(); } /*! @@ -299,8 +287,6 @@ Repository::initFromCache( const string& cacheFile ) } fclose( fp ); - parseDependencyList(); - return READ_OK; } diff --git a/src/repository.h b/src/repository.h index 43c7885..dbf35a1 100644 --- a/src/repository.h +++ b/src/repository.h @@ -66,16 +66,12 @@ public: static bool createOutputDir( const string& path ); void addDependencies( std::map<string, string>& deps ); - static const std::string EXTERNAL_DEPENDENCY_FILE; - private: - static int compareShadowPair(pair<Package*, Package*>& p1, + static int compareShadowPair(pair<Package*, Package*>& p1, pair<Package*, Package*>& p2); static const std::string CACHE_VERSION; bool m_useRegex; - - void parseDependencyList(); list<pair<Package*, Package*> > m_shadowedPackages; map<string, Package*> m_packageMap; |