summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/package.cpp2
-rw-r--r--noncore/unsupported/oipkg/pksettings.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 1054a1d..3effb73 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -395,25 +395,25 @@ bool Package::link()
395} 395}
396 396
397void Package::setLink(bool b) 397void Package::setLink(bool b)
398{ 398{
399 _link = b; 399 _link = b;
400} 400}
401 401
402void Package::parseIpkgFile( QString file) 402void Package::parseIpkgFile( QString file)
403{ 403{
404// 20020830 404// 20020830
405// a quick hack to make oipkg understand the new ipk format 405// a quick hack to make oipkg understand the new ipk format
406// neu: ar pf PACKAGE control.tar.gz | tar xfOz - ./control > /tmp/control 406// neu: ar pf PACKAGE control.tar.gz | tar xfOz - ./control > /tmp/control
407 if (! system("ar pf "+file+" control.tar.gz | tar xfOz - ./control > /tmp/control") ) 407 if (system("ar pf "+file+" control.tar.gz | tar xfOz - ./control > /tmp/control") != 0)
408 { 408 {
409//#old tar ipk format 409//#old tar ipk format
410 system("tar xzf "+file+" -C /tmp"); 410 system("tar xzf "+file+" -C /tmp");
411 system("tar xzf /tmp/control.tar.gz -C /tmp"); 411 system("tar xzf /tmp/control.tar.gz -C /tmp");
412 } 412 }
413 QFile f("/tmp/control"); 413 QFile f("/tmp/control");
414 if ( f.open(IO_ReadOnly) ) 414 if ( f.open(IO_ReadOnly) )
415 { 415 {
416 QTextStream t( &f ); 416 QTextStream t( &f );
417 QStringList pack; 417 QStringList pack;
418 while ( !t.eof() ) 418 while ( !t.eof() )
419 { 419 {
diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp
index acabaed..063b018 100644
--- a/noncore/unsupported/oipkg/pksettings.cpp
+++ b/noncore/unsupported/oipkg/pksettings.cpp
@@ -218,30 +218,29 @@ void PackageManagerSettings::serverUrlChanged(const QString& t)
218 218
219void PackageManagerSettings::destUrlChanged(const QString& t) 219void PackageManagerSettings::destUrlChanged(const QString& t)
220{ 220{
221 destinationurlDic.replace(editeddestination, new QString(t)); 221 destinationurlDic.replace(editeddestination, new QString(t));
222 changed = true; 222 changed = true;
223} 223}
224 224
225void PackageManagerSettings::writeIpkgConfig(const QString& conffile) 225void PackageManagerSettings::writeIpkgConfig(const QString& conffile)
226{ 226{
227 QFile conf(conffile); 227 QFile conf(conffile);
228 if ( ! conf.open(IO_WriteOnly) ) return; 228 if ( ! conf.open(IO_WriteOnly) ) return;
229 QTextStream s(&conf); 229 QTextStream s(&conf);
230 s << "# Written by qpie Package Manager\n"; 230 s << "# Written by oipkg -- the opie package manager\n";
231 for (int i=0; i<(int)activeServers->count(); i++) 231 for (int i=0; i<(int)activeServers->count(); i++)
232 { 232 {
233 QString url = serverurlDic[i] ? *serverurlDic[i] : QString("???"); 233 QString url = serverurlDic[i] ? *serverurlDic[i] : QString("???");
234 if ( !activeServers->isSelected(i) ) 234 if ( !activeServers->isSelected(i) ) s << "#";
235 s << "#";
236 s << "src " << activeServers->text(i) << " " << url << "\n"; 235 s << "src " << activeServers->text(i) << " " << url << "\n";
237 } 236 }
238 for (int i=0; i<(int)destinations->count(); i++) 237 for (int i=0; i<(int)destinations->count(); i++)
239 { 238 {
240 QString url = destinationurlDic[i] ? *destinationurlDic[i] : QString("???"); 239 QString url = destinationurlDic[i] ? *destinationurlDic[i] : QString("???");
241 s << "dest " << destinations->text(i) << " " << url << "\n"; 240 s << "dest " << destinations->text(i) << " " << url << "\n";
242 } 241 }
243 conf.close(); 242 conf.close();
244} 243}
245 244
246 245
247void PackageManagerSettings::readInstallationSettings() 246void PackageManagerSettings::readInstallationSettings()