Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/modulesets/glucose-0.84.modules4
-rw-r--r--config/modulesets/glucose-external-0.84.modules7
-rw-r--r--sjhbuild/sysdeps.py2
3 files changed, 3 insertions, 10 deletions
diff --git a/config/modulesets/glucose-0.84.modules b/config/modulesets/glucose-0.84.modules
index cf91a3b..d9fad8d 100644
--- a/config/modulesets/glucose-0.84.modules
+++ b/config/modulesets/glucose-0.84.modules
@@ -37,12 +37,12 @@
</dependencies>
</autotools>
<autotools id="sugar-artwork">
- <branch module="sugar-artwork/mainline.git" checkoutdir="sugar-artwork"/>
+ <branch module="sugar-artwork/mainline.git" revision="sucrose-0.84" checkoutdir="sugar-artwork"/>
<dependencies>
</dependencies>
</autotools>
<autotools id="sugar-datastore">
- <branch module="sugar-datastore/mainline.git" checkoutdir="sugar-datastore"/>
+ <branch module="sugar-datastore/mainline.git" revision="sucrose-0.84" checkoutdir="sugar-datastore"/>
</autotools>
<metamodule id="meta-glucose">
diff --git a/config/modulesets/glucose-external-0.84.modules b/config/modulesets/glucose-external-0.84.modules
index 4f4f3f6..e47f085 100644
--- a/config/modulesets/glucose-external-0.84.modules
+++ b/config/modulesets/glucose-external-0.84.modules
@@ -162,11 +162,4 @@
module="dbus-glib/dbus-glib-0.78.tar.gz"
size="683454" md5sum="d4aa04b9df35b4bd663be38e959941c8" />
</autotools>
- <distutils id="sugar-update-control">
- <branch repo="git.sugarlabs.org"
- module="sugar-update-control/mainline.git" checkoutdir="sugar-update-control" />
- <dependencies>
- <dep package="sugar"/>
- </dependencies>
- </distutils>
</moduleset>
diff --git a/sjhbuild/sysdeps.py b/sjhbuild/sysdeps.py
index a328ab2..7aeb026 100644
--- a/sjhbuild/sysdeps.py
+++ b/sjhbuild/sysdeps.py
@@ -39,7 +39,7 @@ def get_distribution():
_cached_dversion = _pipe_lower(['lsb_release', '-rs'])
except OSError:
- sys.stderr.write('ERROR: Could not run lsb_release. Is it installed?')
+ sys.stderr.write('ERROR: Could not run lsb_release. Is it installed?\n')
return _cached_dname, _cached_dversion