[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge/emerge2] /: fixed usage of subst path
From:       Patrick von Reth <vonreth () kde ! org>
Date:       2014-04-30 23:20:57
Message-ID: E1Wfdo9-0004UD-1A () scm ! kde ! org
[Download RAW message or body]

Git commit 3696b5c969c5a3d0a957b328d42666edb7979be4 by Patrick von Reth.
Committed on 30/04/2014 at 23:20.
Pushed by vonreth into branch 'emerge2'.

fixed usage of subst path

M  +2    -0    bin/EmergeBase.py
M  +2    -1    bin/Source/SvnSource.py
M  +13   -1    bin/Source/VersionSystemSourceBase.py
M  +14   -6    bin/emerge_config.py
M  +2    -1    portage/package/amarok-package/amarok-package.py

http://commits.kde.org/emerge/3696b5c969c5a3d0a957b328d42666edb7979be4

diff --git a/bin/EmergeBase.py b/bin/EmergeBase.py
index 03e313c..a78e3ab 100644
--- a/bin/EmergeBase.py
+++ b/bin/EmergeBase.py
@@ -141,6 +141,8 @@ class EmergeBase(object):
 
     def downloadDir(self):
         """ location of directory where fetched files are  stored """
+        if emergeSettings.getboolean("ShortPath", "EMERGE_USE_SHORT_PATH", False):
+            return nomalizePath(emergeSettings.get("ShortPath", \
                "EMERGE_DOWNLOAD_DRIVE"))
         return self.__adjustPath(emergeSettings.get("Paths", "DOWNLOADDIR"))
 
     def sourceDir(self, dummyIndex=0):
diff --git a/bin/Source/SvnSource.py b/bin/Source/SvnSource.py
index 40c2e99..fd5c969 100644
--- a/bin/Source/SvnSource.py
+++ b/bin/Source/SvnSource.py
@@ -17,6 +17,7 @@ class SvnSource (VersionSystemSourceBase):
         ## \todo add internal dependency for subversion package
         self.svnInstallDir = os.path.join(self.rootdir, 'dev-utils', 'svn', 'bin')
 
+
     def checkoutDir( self, index=0 ):
         utils.trace( "SvnSource.checkoutDir", 2 )
         if self.subinfo.hasSvnTarget():
@@ -24,7 +25,7 @@ class SvnSource (VersionSystemSourceBase):
             (url, dummy) = self.splitUrl(u)
 
             if url.find("://") == -1:
-                sourcedir = os.path.join( emergeSettings.get("Paths", "KDESVNDIR"), \
url ) +                sourcedir = os.path.join(VersionSystemSourceBase.svnDir(), url \
)  else:
                 sourcedir = os.path.join( self.downloadDir(), "svn-src" )
                 sourcedir = os.path.join( sourcedir, self.package )
diff --git a/bin/Source/VersionSystemSourceBase.py \
b/bin/Source/VersionSystemSourceBase.py index ec8fabb..d73433b 100644
--- a/bin/Source/VersionSystemSourceBase.py
+++ b/bin/Source/VersionSystemSourceBase.py
@@ -22,6 +22,18 @@ class VersionSystemSourceBase (SourceBase):
         utils.trace( "VersionSystemSourceBase __init__", 2 )
         SourceBase.__init__(self)
 
+    @staticmethod
+    def svnDir():
+        if emergeSettings.getboolean("ShortPath", "EMERGE_USE_SHORT_PATH", False):
+            return nomalizePath(emergeSettings.get("ShortPath", "EMERGE_SVN_DRIVE"))
+        return  emergeSettings.get("Paths", "KDESVNDIR")
+
+    @staticmethod
+    def gitDir():
+        if emergeSettings.getboolean("ShortPath", "EMERGE_USE_SHORT_PATH", False):
+            return nomalizePath(emergeSettings.get("ShortPath", "EMERGE_GIT_DRIVE"))
+        return  emergeSettings.get("Paths", "KDEGITDIR")
+
     def getUrl( self, index ):
         """get the url at position 'index' from a ';' separated list of urls"""
         utils.trace( "VersionSystemSourceBase getUrl", 2 )
@@ -115,7 +127,7 @@ class VersionSystemSourceBase (SourceBase):
     def checkoutDir( self, dummyIndex=0 ):
         utils.trace( "VersionSystemSourceBase checkoutDir", 2 )
         if self.subinfo.hasSvnTarget():
-            sourcedir = os.path.join(  emergeSettings.get("Paths",  "KDEGITDIR" ), \
self.package ) +            sourcedir = os.path.join(  self.gitDir(), self.package )
         else:
             utils.die("svnTarget property not set for this target")
 
diff --git a/bin/emerge_config.py b/bin/emerge_config.py
index 01b49cc..26d35bb 100644
--- a/bin/emerge_config.py
+++ b/bin/emerge_config.py
@@ -10,13 +10,14 @@ import sys
 
 emergeSettings = None
 
+def nomalizePath(path):
+    if path.endswith( ":" ):
+        path += "\\"
+    return path
 
 def emergeRoot( ):
-    if not emergeSettings is None and emergeSettings.get( "ShortPath", \
                "EMERGE_USE_SHORT_PATH", "False" ) == "True":
-        path = emergeSettings.get( "ShortPath", "EMERGE_ROOT_DRIVE" )
-        if path.endswith( ":" ):
-            path += "\\"
-        return path
+    if not emergeSettings is None and emergeSettings.getboolean("ShortPath", \
"EMERGE_USE_SHORT_PATH", False): +        return  nomalizePath(emergeSettings.get( \
                "ShortPath", "EMERGE_ROOT_DRIVE" ))
     return os.path.abspath( os.path.join( os.path.dirname( sys.argv[ 0 ] ), "..", \
".." ) )  
 
@@ -85,8 +86,15 @@ class EmergeConfig( object ):
             return default
         self._config[ group ][ key ]
 
+    def getboolean(self,  group, key, default = False):
+        val = self.get(group,key,default)
+        return self._config._convert_to_boolean(val)
+
+
     def set( self, group, key, value ):
-        self._config[ group ][ key ] = value
+        if not self._config.has_section(group):
+            self._config.add_section(group)
+        self._config[ group ][ key ] = str(value)
         if self.get( "General", "DUMP_SETTINGS", "False" ) == "True":
             with open( self.iniPath + ".dump", 'wt+' ) as configfile:
                 self._config.write( configfile )
diff --git a/portage/package/amarok-package/amarok-package.py \
b/portage/package/amarok-package/amarok-package.py index d42a06d..e9b49a8 100644
--- a/portage/package/amarok-package/amarok-package.py
+++ b/portage/package/amarok-package/amarok-package.py
@@ -2,6 +2,7 @@
 import info
 from Package.VirtualPackageBase import *
 from Packager.NullsoftInstallerPackager import *
+from Source.VersionSystemSourceBase import *
 #you have to install
 #http://nsis.sourceforge.net/Nsis7z_plug-in
 
@@ -31,6 +32,6 @@ class Package( NullsoftInstallerPackager, VirtualPackageBase ):
         blacklists = [ NSIPackagerLists.runtimeBlacklist, 'blacklist.txt', \
'blacklist-virtuoso.txt' ]  NullsoftInstallerPackager.__init__( self, \
blacklists=blacklists )  VirtualPackageBase.__init__( self )
-        self.scriptname = os.path.join( emergeSettings.get("Paths",  "KDEGITDIR" ), \
"amarok", "release_scripts", "windows", "amarok.nsi") +        self.scriptname = \
os.path.join( VersionSystemSourceBase.gitDir() , "amarok", "release_scripts", \
"windows", "amarok.nsi")  self.defines[ "kde-version" ] = "4.11.0"
 


[prev in list] [next in list] [prev in thread] [next in thread]