summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/package.cpp8
-rw-r--r--noncore/unsupported/oipkg/package.h1
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp5
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
@@ -139,6 +139,14 @@ QString Package::installName()
139 else return _name; 139 else return _name;
140} 140}
141 141
142QString Package::packageName()
143{
144 QString pn = installName();
145 pn = pn.right(pn.length()-pn.findRev("/"));
146 pn = pn.left(pn.find("_"));
147 return pn;
148}
149
142bool Package::installed() 150bool Package::installed()
143{ 151{
144 if (_status.contains("installed")) 152 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
@@ -26,6 +26,7 @@ class Package : public QObject
26 26
27 QString name(); 27 QString name();
28 QString installName(); 28 QString installName();
29 QString packageName();
29 bool installed(); 30 bool installed();
30 bool otherInstalled(); 31 bool otherInstalled();
31 32
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
@@ -60,7 +60,7 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
60#ifdef OPROCESS 60#ifdef OPROCESS
61 ipkgProcess->clearArguments(); 61 ipkgProcess->clearArguments();
62 *ipkgProcess << "/usr/bin/ipkg "; 62 *ipkgProcess << "/usr/bin/ipkg ";
63 QString cmd = ""; 63 cmd = "";
64#endif 64#endif
65 pvDebug( 3,"PmIpkg::runIpkg got dest="+dest); 65 pvDebug( 3,"PmIpkg::runIpkg got dest="+dest);
66 if ( dest == "" ) 66 if ( dest == "" )
@@ -153,7 +153,8 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
153void PmIpkg::makeLinks(Package *pack) 153void PmIpkg::makeLinks(Package *pack)
154{ 154{
155 pvDebug( 2, "PmIpkg::makeLinks "+ pack->name()); 155 pvDebug( 2, "PmIpkg::makeLinks "+ pack->name());
156 linkPackage( pack->name(), pack->dest() ); 156 QString pn = pack->name();
157 linkPackage( pack->packageName(), pack->dest() );
157} 158}
158 159
159QStringList* PmIpkg::getList( QString packFileName, QString d ) 160QStringList* PmIpkg::getList( QString packFileName, QString d )