-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index 4a8a389..d29036b 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp | |||
@@ -151,75 +151,78 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) | |||
151 | if (lineStr.contains("Done")) ret = true; | 151 | if (lineStr.contains("Done")) ret = true; |
152 | if (lineStr!=lineStrOld) | 152 | if (lineStr!=lineStrOld) |
153 | out(lineStr); | 153 | out(lineStr); |
154 | lineStrOld = lineStr; | 154 | lineStrOld = lineStr; |
155 | qApp->processEvents(); | 155 | qApp->processEvents(); |
156 | } | 156 | } |
157 | } | 157 | } |
158 | pclose(fp); | 158 | pclose(fp); |
159 | #endif | 159 | #endif |
160 | //out( "Finished!"); | 160 | //out( "Finished!"); |
161 | pvDebug(2,QString(ret?"success\n":"failure\n")); | 161 | pvDebug(2,QString(ret?"success\n":"failure\n")); |
162 | return ret; | 162 | return ret; |
163 | } | 163 | } |
164 | 164 | ||
165 | void PmIpkg::makeLinks(Package *pack) | 165 | void PmIpkg::makeLinks(Package *pack) |
166 | { | 166 | { |
167 | pvDebug( 2, "PmIpkg::makeLinks "+ pack->name()); | 167 | pvDebug( 2, "PmIpkg::makeLinks "+ pack->name()); |
168 | QString pn = pack->name(); | 168 | QString pn = pack->name(); |
169 | linkPackage( pack->packageName(), pack->dest() ); | 169 | linkPackage( pack->packageName(), pack->dest() ); |
170 | } | 170 | } |
171 | 171 | ||
172 | QStringList* PmIpkg::getList( QString packFileName, QString d ) | 172 | QStringList* PmIpkg::getList( QString packFileName, QString d ) |
173 | { | 173 | { |
174 | QString dest = settings->getDestinationUrlByName( d ); | 174 | QString dest = settings->getDestinationUrlByName( d ); |
175 | dest = dest==""?d:dest; | 175 | dest = dest==""?d:dest; |
176 | // if (dest == "/" ) return 0; | 176 | // if (dest == "/" ) return 0; |
177 | { | 177 | { |
178 | Config cfg( "oipkg", Config::User ); | 178 | Config cfg( "oipkg", Config::User ); |
179 | cfg.setGroup( "Common" ); | 179 | cfg.setGroup( "Common" ); |
180 | QString statusDir = cfg.readEntry( "statusDir", "" ); | 180 | QString statusDir = cfg.readEntry( "statusDir", "" ); |
181 | } | 181 | } |
182 | QString packFileDir = dest+"/"+statusDir+"/info/"+packFileName+".list"; | 182 | QString packFileDir = dest+"/"+statusDir+"/info/"+packFileName+".list"; |
183 | QFile f( packFileName ); | 183 | QFile f( packFileDir ); |
184 | qDebug("Try to open %s", packFileDir.latin1()); | ||
184 | if ( ! f.open(IO_ReadOnly) ) | 185 | if ( ! f.open(IO_ReadOnly) ) |
185 | { | 186 | { |
186 | out( "Could not open:\n"+packFileDir ); | 187 | out( "Could not open:\n"+packFileDir ); |
187 | f.close(); | 188 | f.close(); |
188 | packFileDir = "/"+statusDir+"/info/"+packFileName+".list"; | 189 | packFileDir = "/"+statusDir+"/info/"+packFileName+".list"; |
189 | f.setName( packFileDir ); | 190 | f.setName( packFileDir ); |
191 | qDebug("Try to open %s", packFileDir.latin1()); | ||
190 | if ( ! f.open(IO_ReadOnly) ) | 192 | if ( ! f.open(IO_ReadOnly) ) |
191 | { | 193 | { |
192 | qDebug(" Panik! Could not open"+packFileDir); | 194 | qDebug(" Panik! Could not open"+packFileDir); |
193 | out( "Could not open:\n"+packFileDir+"\n Panik!" ); | 195 | out( "Could not open:\n"+packFileDir+"\n Panik!" ); |
196 | return (QStringList*)0; | ||
194 | } | 197 | } |
195 | } | 198 | } |
196 | QStringList *fileList = new QStringList(); | 199 | QStringList *fileList = new QStringList(); |
197 | QTextStream t( &f ); | 200 | QTextStream t( &f ); |
198 | while ( !t.eof() ) | 201 | while ( !t.eof() ) |
199 | { | 202 | { |
200 | *fileList += t.readLine(); | 203 | *fileList += t.readLine(); |
201 | } | 204 | } |
202 | f.close(); | 205 | f.close(); |
203 | return fileList; | 206 | return fileList; |
204 | } | 207 | } |
205 | 208 | ||
206 | void PmIpkg::linkPackage( QString packFileName, QString dest ) | 209 | void PmIpkg::linkPackage( QString packFileName, QString dest ) |
207 | { | 210 | { |
208 | if (dest == "root" || dest == "/" ) return; | 211 | if (dest == "root" || dest == "/" ) return; |
209 | QStringList *fileList = getList( packFileName, dest ); | 212 | QStringList *fileList = getList( packFileName, dest ); |
210 | processFileList( fileList, dest ); | 213 | processFileList( fileList, dest ); |
211 | delete fileList; | 214 | delete fileList; |
212 | } | 215 | } |
213 | 216 | ||
214 | void PmIpkg::processFileList( QStringList *fileList, QString d ) | 217 | void PmIpkg::processFileList( QStringList *fileList, QString d ) |
215 | { | 218 | { |
216 | if (!fileList) return; | 219 | if (!fileList) return; |
217 | for (uint i=0; i < fileList->count(); i++) | 220 | for (uint i=0; i < fileList->count(); i++) |
218 | { | 221 | { |
219 | QString dest = settings->getDestinationUrlByName( d ); | 222 | QString dest = settings->getDestinationUrlByName( d ); |
220 | dest = dest==""?d:dest; | 223 | dest = dest==""?d:dest; |
221 | processLinkDir( (*fileList)[i], dest ); | 224 | processLinkDir( (*fileList)[i], dest ); |
222 | } | 225 | } |
223 | } | 226 | } |
224 | 227 | ||
225 | 228 | ||