prt-get (2.2): fix upstream bugs

This commit is contained in:
Johannes Winkelmann 2006-03-16 20:34:16 +00:00
parent ab0556237a
commit 931cffe9cc
4 changed files with 31 additions and 4 deletions

View File

@ -14,4 +14,3 @@ drwxr-xr-x root/root var/
drwxr-xr-x root/root var/lib/
drwxr-xr-x root/root var/lib/pkg/
-rw-r--r-- root/root var/lib/pkg/prt-get.aliases
-rw-r--r-- root/root var/lib/pkg/prt-get.deplist

View File

@ -1,2 +1,3 @@
cb47e392c3d0ee6042f68f48f2b36bca prt-get-0.5.11-deptree-alias.diff
a9297b69ec9eacd555b291bc9ef50ad5 prt-get-0.5.11.tar.gz
2b1cec6ab2834ae7402b92f7bbd54d3b prt-get.conf

View File

@ -4,15 +4,17 @@
name=prt-get
version=0.5.11
release=2
release=3
source=(http://jw.tks6.net/files/crux/prt-get-$version.tar.gz \
prt-get.conf)
prt-get.conf prt-get-0.5.11-deptree-alias.diff)
build() {
cd ${name}-${version}
patch -p1 < $SRC/prt-get-0.5.11-deptree-alias.diff
./configure --prefix=/usr
make
make DESTDIR=$PKG install
install -m 644 $SRC/prt-get.conf $PKG/etc/
install -m 644 $SRC/prt-get.conf $PKG/etc/
rm -r $PKG/var/lib/pkg/prt-get.deplist
}

View File

@ -0,0 +1,25 @@
--- prt-get-0.5.11/src/prtget.cpp 2005-06-01 22:33:43.000000000 +0200
+++ prt-get-0.5.11.new/src/prtget.cpp 2006-03-15 10:07:38.000000000 +0100
@@ -1786,8 +1785,11 @@
list<string> deps;
StringHelper::split(package->dependencies(), ',', deps);
list<string>::iterator it = deps.begin();
+ bool isAlias = false;
+ string aliasName = "";
+
for (; it != deps.end(); ++it) {
- if ( m_pkgDB->isInstalled( *it ) ) {
+ if ( m_pkgDB->isInstalled( *it, true, &isAlias, &aliasName ) ) {
cout << "[i] ";
} else {
cout << "[ ] ";
@@ -1796,6 +1798,9 @@
cout << " ";
}
cout << *it;
+ if (isAlias) {
+ cout << " (provided by " << aliasName << ")";
+ }
const Package* p = m_repo->getPackage( *it );
if (p) {
if (p->dependencies().length() > 0) {