Fixed bug with reading ipkg.conf (ignored src lines that were commented out

   with # src
Also, now writes a nice comment out to the ipkg.conf file

1 files changed, 45 insertions, 8 deletions

diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index b9ce227..b6e6e37 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -85,2 +85,9 @@ void DataManager :: loadServers()
     {
+        {
+            cout << "Before ipkg.conf read" << endl;
+            vector<Server>::iterator it;
+            for ( it = serverList.begin() ; it != serverList.end() ; ++it )
+                cout << "servername - " << it->getServerName() << endl;
+        }
+        
         while ( fgets( line, sizeof line, fp) != NULL )
@@ -88,3 +95,3 @@ void DataManager :: loadServers()
             lineStr = line;
-            if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) )
+            if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) )
             {
@@ -92,3 +99,11 @@ void DataManager :: loadServers()
                 char url[100];
-                sscanf( lineStr, "%*[^ ] %s %s", alias, url );
+
+
+                // Looks a little wierd but read up to the r of src (throwing it away),
+                // then read up to the next space and throw that away, the alias
+                // is next.
+                // Should Handle #src, # src, src, and combinations of
+                sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url );
+                cout << "Adding alias " << alias << " to list" << endl;
+                cout << lineStr << endl;
                 Server s( alias, url );
@@ -108,2 +123,9 @@ void DataManager :: loadServers()
         }
+        {
+            cout << "After ipkg.conf read" << endl;
+            vector<Server>::iterator it;
+            for ( it = serverList.begin() ; it != serverList.end() ; ++it )
+                cout << "servername - " << it->getServerName() << endl;
+        }
+        
     }
@@ -113,7 +135,7 @@ void DataManager :: loadServers()
     // don't already exist
-	/* AQ - commented out as if you don't have a CF or SD card in then
-	 * this causes IPKG to try to create directories on non existant devices
-	 * (which of course fails), gives a nasty error message and can cause ipkg
-	 * to seg fault.
-	 *
+/* AQ - commented out as if you don't have a CF or SD card in then
+ * this causes IPKG to try to create directories on non existant devices
+ * (which of course fails), gives a nasty error message and can cause ipkg
+ * to seg fault.
+ *
     vector<Destination>::iterator dit;
@@ -172,3 +194,16 @@ void DataManager :: writeOutIpkgConf()
 
-    out << "# Written by NetworkPackageManager Package Manager" << endl;
+    out << "# Written by AQPkg" << endl;
+    out << "# Must have one or more source entries of the form:" << endl;
+    out << "#" << endl;
+    out << "#   src <src-name> <source-url>" << endl;
+    out << "#" << endl;
+    out << "# and one or more destination entries of the form:" << endl;
+    out << "#" << endl;
+    out << "#   dest <dest-name> <target-path>" << endl;
+    out << "#" << endl;
+    out << "# where <src-name> and <dest-names> are identifiers that" << endl;
+    out << "# should match [a-zA-Z0-9._-]+, <source-url> should be a" << endl;
+    out << "# URL that points to a directory containing a Familiar" << endl;
+    out << "# Packages file, and <target-path> should be a directory" << endl;
+    out << "# that exists on the target system." << endl << endl;
 
@@ -192,2 +227,4 @@ void DataManager :: writeOutIpkgConf()
 
+    out << endl;
+
     // Write out destinations