[rkward] /: Don't list rkward-repo twice in fresh installation

Thomas Friedrichsmeier thomas.friedrichsmeier at ruhr-uni-bochum.de
Wed Nov 18 12:11:06 UTC 2015


Git commit d31df1258f4382e96bb43fec015ecb1e7a06bea4 by Thomas Friedrichsmeier.
Committed on 18/11/2015 at 12:11.
Pushed by tfry into branch 'master'.

Don't list rkward-repo twice in fresh installation

M  +1    -0    ChangeLog
M  +1    -1    rkward/settings/rksettingsmoduler.cpp

http://commits.kde.org/rkward/d31df1258f4382e96bb43fec015ecb1e7a06bea4

diff --git a/ChangeLog b/ChangeLog
index b3dc5e5..a892c1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+- Fixed: RKWard package repository would be listed twice on fresh installations
 - Switch to bugs.kde.org as primary issue tracker
 - Workspace browser gains functionality to search / filter objects by name
 - Separate globalenv() and other environments in the search path more clearly in workspace browser
diff --git a/rkward/settings/rksettingsmoduler.cpp b/rkward/settings/rksettingsmoduler.cpp
index fd18973..e48a89d 100644
--- a/rkward/settings/rksettingsmoduler.cpp
+++ b/rkward/settings/rksettingsmoduler.cpp
@@ -577,7 +577,7 @@ void RKSettingsModuleRPackages::loadSettings (KConfig *config) {
 	package_repositories = cg.readEntry ("Repositories", QStringList (rkward_repo));
 	if (RKSettingsModuleGeneral::storedConfigVersion () <= RKSettingsModuleGeneral::RKWardConfig_Pre0_5_7) {
 		package_repositories.removeAll ("@CRAN@");	// COMPAT: Cran mirror was part of this list before 0.5.3
-		package_repositories.append (rkward_repo);
+		if (package_repositories.isEmpty ()) package_repositories.append (rkward_repo);
 	} else if (RKSettingsModuleGeneral::storedConfigVersion () < RKSettingsModuleGeneral::RKWardConfig_0_6_3) {
 		package_repositories.removeAll ("http://rkward.sf.net/R");
 		package_repositories.append (rkward_repo);



More information about the rkward-tracker mailing list