Merge pull request #19 from yast/better_option_parsing

Better option parsing, properly handle mixed -I and -M options

VERSION

@@ -1 +1 @@
-2.24.1
+2.24.2

liby2/src/genericfrontend.cc

@@ -657,18 +657,14 @@ main (int argc, char **argv)
     std::list<std::string> modpaths;
     std::list<std::string> incpaths;
 
-    // include paths
-    while (!strcmp(argv[arg], "-I"))
+    // include and module paths
+    while (!strcmp(argv[arg], "-I") || !strcmp(argv[arg], "-M"))
     {
-	arg++;
-	incpaths.push_front (string (argv[arg])); // push to front so first one is last in list
-	arg++;
-    }
+        if (!strcmp(argv[arg++], "-I"))
+            incpaths.push_front (string (argv[arg])); // push to front so first one is last in list
+        else
+            modpaths.push_front (string (argv[arg])); // push to front so first one is last in list
 
-    while (!strcmp(argv[arg], "-M"))
-    {
-	arg++;
-	modpaths.push_front (string (argv[arg])); // push to front so first one is last in list
 	arg++;
     }
 

package/yast2-core.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun 21 13:50:31 UTC 2013 - lslezak@suse.cz
+
+- y2base: handle interleaved -I and -M options, as used by
+  Makefiles of rubified modules.
+- 2.24.2
+
 -------------------------------------------------------------------
 Fri Jun 21 12:13:54 UTC 2013 - mvidner@suse.com