author | tille <tille> | 2002-06-25 11:24:49 (UTC) |
---|---|---|
committer | tille <tille> | 2002-06-25 11:24:49 (UTC) |
commit | d282b4f9cba20305e237910aca531b0360666f13 (patch) (unidiff) | |
tree | 38845ae936110de2b60fe67191d83ba5a2232726 | |
parent | 8b39fcc7dbc0579c27e42918974a407104dc9fac (diff) | |
download | opie-d282b4f9cba20305e237910aca531b0360666f13.zip opie-d282b4f9cba20305e237910aca531b0360666f13.tar.gz opie-d282b4f9cba20305e237910aca531b0360666f13.tar.bz2 |
getting the list file right now
-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() | |||
140 | } | 140 | } |
141 | 141 | ||
142 | QString 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 | |||
142 | bool Package::installed() | 150 | bool Package::installed() |
143 | { | 151 | { |
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 | |||
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(); |
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 ) | |||
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); |
@@ -154,5 +154,6 @@ void 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 | ||