Michael Lange avatar Michael Lange committed cbfdba9 Merge

Merging in Florian's buildsystem fixes.

Comments (0)

Files changed (1)

config/configure.py

   print '''++ Could not locate BuildSystem in %s.''' % configDir
   (status,output) = commands.getstatusoutput('hg showconfig paths.default')
   if status or not output:
-    print '++ Mercurial clone not found. Assuming petsc-dev and downloading from https://bitbucket.org/petsc/buildsystem/get/tip.tar.gz'
-    downloadPackage('https://bitbucket.org/petsc/buildsystem/get/tip.tar.gz', 'BuildSystem.tar.gz', configDir)
+    print '++ Mercurial clone not found. Downloading it from https://bitbucket.org/petsc/buildsystem/get/default.tar.gz'
+    downloadPackage('https://bitbucket.org/petsc/buildsystem/get/default.tar.gz', 'BuildSystem.tar.gz', configDir)
   else:
     print '++ Mercurial clone found. URL : ' + output
-    bsurl = output.replace('petsc-dev','buildsystem').replace('petsc-','buildsystem-')
+    bsurl = output.replace('petsc-dev','BuildSystem').replace('releases/petsc-','releases/BuildSystem-')
+    # If cloned from a non-standard repository, get BuildSystem from default location
+    if bsurl == output:
+        bsurl = 'https://bitbucket.org/petsc/buildsystem'
+    if bsurl.find('bitbucket.org') >=0: bsurl = bsurl.lower()
     print '++ Using: hg clone '+ bsurl +' '+ bsDir
     (status,output) = commands.getstatusoutput('hg clone '+ bsurl +' '+ bsDir)
     if status:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.