diff --git a/blueprints/craft/craftmaster/craftmaster.py b/blueprints/craft/craftmaster/craftmaster.py index c5519b1..cecd91a 100644 --- a/blueprints/craft/craftmaster/craftmaster.py +++ b/blueprints/craft/craftmaster/craftmaster.py @@ -1,51 +1,43 @@ # -*- coding: utf-8 -*- # Copyright Hannah von Reth # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. import info class subinfo(info.infoclass): def setTargets(self): - self.targets["master"] = "git://anongit.kde.org/craftmaster" + self.svnTargets["master"] = "[git]" self.defaultTarget = "master" -from Package.VirtualPackageBase import * +from Package.BlueprintRepositoryPackageBase import * -class Package(SourceComponentPackageBase): +class Package(BlueprintRepositoryPackageBase): def __init__(self): - SourceOnlyPackageBase.__init__(self) - self.subinfo.options.package.disableBinaryCache = True - self.subinfo.options.dailyUpdate = True - - def qmerge(self): - if not SourceOnlyPackageBase.qmerge(self): - return False - CraftCore.cache.clear() - return True + BlueprintRepositoryPackageBase.__init__(self) def checkoutDir(self, index=0): - return os.path.join(os.path.dirname(__file__), "..") + return os.path.join(os.path.dirname(__file__), "..", "..", "..")