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
@@ -138,8 +138,16 @@ QString Package::installName()
 	if (_useFileName) return _fileName;
   else return _name;
 }
 
+QString Package::packageName()
+{
+	QString pn = installName();
+ 	pn = pn.right(pn.length()-pn.findRev("/"));
+  pn = pn.left(pn.find("_"));
+ 	return pn;
+}
+
 bool Package::installed()
 {
   if (_status.contains("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
@@ -25,8 +25,9 @@ class Package : public QObject
   void    copyValues( Package* );
 
   QString name();
   QString installName();
+  QString packageName();
   bool    installed();
   bool    otherInstalled();
 
   void    setDesc( QString );
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
@@ -59,9 +59,9 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
   QString cmd = "/usr/bin/ipkg ";
 #ifdef OPROCESS
   ipkgProcess->clearArguments();
   *ipkgProcess << "/usr/bin/ipkg ";
-  QString cmd = "";
+  cmd = "";
 #endif
 	pvDebug( 3,"PmIpkg::runIpkg got dest="+dest);
 	if ( dest == "" )
 	  cmd += " -dest "+settings->getDestinationName();
@@ -152,9 +152,10 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
 
 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() );
 }
 
 QStringList* PmIpkg::getList( QString packFileName, QString d )
 {