summaryrefslogtreecommitdiff
authortille <tille>2002-09-03 18:35:54 (UTC)
committer tille <tille>2002-09-03 18:35:54 (UTC)
commit6e4c5aebd3d2a7203480e5f408358c677203f9ca (patch) (side-by-side diff)
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
@@ -395,25 +395,25 @@ bool Package::link()
}
void Package::setLink(bool b)
{
_link = b;
}
void Package::parseIpkgFile( QString file)
{
// 20020830
// a quick hack to make oipkg understand the new ipk format
// neu: ar pf PACKAGE control.tar.gz | tar xfOz - ./control > /tmp/control
- if (! system("ar pf "+file+" control.tar.gz | tar xfOz - ./control > /tmp/control") )
+ if (system("ar pf "+file+" control.tar.gz | tar xfOz - ./control > /tmp/control") != 0)
{
//#old tar ipk format
system("tar xzf "+file+" -C /tmp");
system("tar xzf /tmp/control.tar.gz -C /tmp");
}
QFile f("/tmp/control");
if ( f.open(IO_ReadOnly) )
{
QTextStream t( &f );
QStringList pack;
while ( !t.eof() )
{
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)
void PackageManagerSettings::destUrlChanged(const QString& t)
{
destinationurlDic.replace(editeddestination, new QString(t));
changed = true;
}
void PackageManagerSettings::writeIpkgConfig(const QString& conffile)
{
QFile conf(conffile);
if ( ! conf.open(IO_WriteOnly) ) return;
QTextStream s(&conf);
- s << "# Written by qpie Package Manager\n";
+ s << "# Written by oipkg -- the opie package manager\n";
for (int i=0; i<(int)activeServers->count(); i++)
{
QString url = serverurlDic[i] ? *serverurlDic[i] : QString("???");
- if ( !activeServers->isSelected(i) )
- s << "#";
+ if ( !activeServers->isSelected(i) ) s << "#";
s << "src " << activeServers->text(i) << " " << url << "\n";
}
for (int i=0; i<(int)destinations->count(); i++)
{
QString url = destinationurlDic[i] ? *destinationurlDic[i] : QString("???");
s << "dest " << destinations->text(i) << " " << url << "\n";
}
conf.close();
}
void PackageManagerSettings::readInstallationSettings()