-rw-r--r-- | noncore/unsupported/oipkg/package.cpp | 8 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.h | 1 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp index 517b37a..8bbdd77 100644 --- a/noncore/unsupported/oipkg/package.cpp +++ b/noncore/unsupported/oipkg/package.cpp @@ -140,4 +140,12 @@ QString Package::installName() } +QString Package::packageName() +{ + QString pn = installName(); + pn = pn.right(pn.length()-pn.findRev("/")); + pn = pn.left(pn.find("_")); + return pn; +} + bool Package::installed() { diff --git a/noncore/unsupported/oipkg/package.h b/noncore/unsupported/oipkg/package.h index f50b9b5..0f76ece 100644 --- a/noncore/unsupported/oipkg/package.h +++ b/noncore/unsupported/oipkg/package.h @@ -27,4 +27,5 @@ class Package : public QObject QString name(); QString installName(); + QString packageName(); bool installed(); bool otherInstalled(); diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index 7d0e246..89309a2 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp @@ -61,5 +61,5 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) ipkgProcess->clearArguments(); *ipkgProcess << "/usr/bin/ipkg "; - QString cmd = ""; + cmd = ""; #endif pvDebug( 3,"PmIpkg::runIpkg got dest="+dest); @@ -154,5 +154,6 @@ void PmIpkg::makeLinks(Package *pack) { pvDebug( 2, "PmIpkg::makeLinks "+ pack->name()); - linkPackage( pack->name(), pack->dest() ); + QString pn = pack->name(); + linkPackage( pack->packageName(), pack->dest() ); } |