Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Make ssu configuration permissions hack configurable at build time
  • Loading branch information
Bernd Wachter committed Oct 21, 2012
1 parent 7d2ebc5 commit f821c53
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
4 changes: 4 additions & 0 deletions libssu/libssu.pro
Expand Up @@ -12,4 +12,8 @@ MOBILITY += systeminfo
unix:target.path = $${PREFIX}/usr/lib
INSTALLS += target

ssuconfhack {
DEFINES += SSUCONFHACK
}

!include( ../buildpath.pri ) { error("Unable to find build path specification") }
2 changes: 2 additions & 0 deletions libssu/ssu.cpp
Expand Up @@ -16,6 +16,7 @@ QTM_USE_NAMESPACE
Ssu::Ssu(): QObject(){
errorFlag = false;

#ifdef SSUCONFHACK
// dirty hack to make sure we can write to the configuration
// this is currently required since there's no global gconf,
// and we migth not yet have users on bootstrap
Expand All @@ -26,6 +27,7 @@ Ssu::Ssu(): QObject(){
proc.start("/usr/bin/ssuconfperm");
proc.waitForFinished();
}
#endif

settings = new QSettings(SSU_CONFIGURATION, QSettings::IniFormat);
repoSettings = new QSettings(SSU_REPO_CONFIGURATION, QSettings::IniFormat);
Expand Down
7 changes: 6 additions & 1 deletion ssu.pro
Expand Up @@ -4,7 +4,12 @@ contains(QT_VERSION, ^4\\.[0-7]\\..*) {

TEMPLATE = subdirs
SUBDIRS = libssu
SUBDIRS += rndssucli rndregisterui ssuurlresolver ssuconfperm
SUBDIRS += rndssucli rndregisterui ssuurlresolver

ssuconfhack {
SUBDIRS += ssuconfperm
}

SUBDIRS += tests

rndssucli.depends = libssu
Expand Down

0 comments on commit f821c53

Please sign in to comment.