From: Duncan Mac-Vicar P <dmacvicar@suse.de>
Date: Fri, 24 Sep 2010 11:20:51 +0000 (+0200)
Subject: Merge branch 'master' into local_services
X-Git-Tag: 8.3.0~6^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4572886a348510f6c54262f77d9fb0f8dc614f16;p=platform%2Fupstream%2Flibzypp.git

Merge branch 'master' into local_services

Conflicts:
	zypp/parser/RepoFileReader.cc
---

4572886a348510f6c54262f77d9fb0f8dc614f16
diff --cc zypp/parser/RepoFileReader.cc
index 9196baf,d915757..9e6ae21
--- a/zypp/parser/RepoFileReader.cc
+++ b/zypp/parser/RepoFileReader.cc
@@@ -73,9 -76,23 +75,22 @@@ namespace zyp
  	    info.setKeepPackages( str::strToTrue( it->second ) );
  	  else if ( it->first == "service" )
  	    info.setService( it->second );
-           else
+           else if ( it->first == "proxy" )
+           {
+ 	    if (it->second != "_none_" )
+             { 
+               str::regex ex("^(.*):([0-9]+)$");
+               str::smatch what;
+               if(str::regex_match(it->second, what, ex)){
+                url.setQueryParam("proxy", what[1]);
+                url.setQueryParam("proxyport", what[2]);
+               }
+             }
+           } else
              ERR << "Unknown attribute in [" << *its << "]: " << it->second << " ignored" << endl;
          }
+         if (url.isValid())
+             info.addBaseUrl(url);
 -
          info.setFilepath(is.path());
          MIL << info << endl;
          // add it to the list.