summaryrefslogtreecommitdiff
authordrw <drw>2004-07-31 16:57:09 (UTC)
committer drw <drw>2004-07-31 16:57:09 (UTC)
commitbc85059dbd265feb3424215a2c1a4818af7d069e (patch) (unidiff)
tree6200d0188ac374741fdcd0019e68227a5a966892
parentb099a3dd18571fcbd5b1211f18ac111ec39f9ce8 (diff)
downloadopie-bc85059dbd265feb3424215a2c1a4818af7d069e.zip
opie-bc85059dbd265feb3424215a2c1a4818af7d069e.tar.gz
opie-bc85059dbd265feb3424215a2c1a4818af7d069e.tar.bz2
Read ipkg.conf even when /etc/ipkg does not exist, found by Bernardo...thanks\!
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/packagemanager/oipkg.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index 87a30bb..eca5861 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -469,6 +469,7 @@ void OIpkg::loadConfiguration()
469 confDir.setNameFilter( "*.conf" ); 469 confDir.setNameFilter( "*.conf" );
470 confDir.setFilter( QDir::Files ); 470 confDir.setFilter( QDir::Files );
471 confFiles = confDir.entryList( "*.conf", QDir::Files ); 471 confFiles = confDir.entryList( "*.conf", QDir::Files );
472 }
472 confFiles << IPKG_CONF; 473 confFiles << IPKG_CONF;
473 474
474 QStringList::Iterator lastFile = confFiles.end(); 475 QStringList::Iterator lastFile = confFiles.end();
@@ -536,7 +537,6 @@ void OIpkg::loadConfiguration()
536 f.close(); 537 f.close();
537 } 538 }
538 } 539 }
539 }
540 540
541 // Load Ipkg execution options from application configuration file 541 // Load Ipkg execution options from application configuration file
542 if ( m_config ) 542 if ( m_config )