summaryrefslogtreecommitdiff
authortille <tille>2002-09-03 18:35:54 (UTC)
committer tille <tille>2002-09-03 18:35:54 (UTC)
commit6e4c5aebd3d2a7203480e5f408358c677203f9ca (patch) (unidiff)
tree57df19225fd14d00763669a889d4c816f9f68a38
parented440196145aec276620b45d7a56400f27eabc82 (diff)
downloadopie-6e4c5aebd3d2a7203480e5f408358c677203f9ca.zip
opie-6e4c5aebd3d2a7203480e5f408358c677203f9ca.tar.gz
opie-6e4c5aebd3d2a7203480e5f408358c677203f9ca.tar.bz2
should fix #180
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
@@ -401,13 +401,13 @@ void Package::setLink(bool b)
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");
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
@@ -224,18 +224,17 @@ void PackageManagerSettings::destUrlChanged(const QString& t)
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";