sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[equo,sulfur] port to new configuration files syntax

Browse Source
This commit is contained in:
Fabio Erculiani
2010-11-17 18:47:39 +01:00
parent 8e5623dccd
commit 7dd5f920c7
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/text_repositories.py
View File

@@ -130,20 +130,20 @@ def _add_repository(entropy_client, repo_strings):
print_warning("[%s] %s" % (
purple(repo_string), blue(_("invalid data, skipping")),))
continue
if not ((repo_string.startswith("repository|")) and \
(len(repo_string.split("|")) == 5)):
print_info("%s: %s" % (
teal(_("Adding repository string")), blue(repo_string),))
try:
repoid, repodata = SystemSettings._analyze_client_repo_string(
repo_string, current_branch, current_product)
except AttributeError:
print_warning("[%s] %s" % (
purple(repo_string),
blue(_("invalid repository string, skipping")),)
)
continue
print_info("%s: %s" % (
teal(_("Adding repository string")), blue(repo_string),))
repoid, repodata = SystemSettings._analyze_client_repo_string(
repo_string, current_branch, current_product)
# print some info
toc = []
toc.append((purple(_("Repository id:")), teal(repoid)))

8
sulfur/src/sulfur/dialogs.py
View File

@@ -262,14 +262,14 @@ class AddRepositoryWindow(MenuSkel):
text = input_box(self.addrepo_ui.addRepoWin, _("Insert Repository"),
_("Insert Repository identification string")+" ")
if text:
if (text.startswith("repository|")) and (len(text.split("|")) == 5):
current_branch = self._entropy.Settings()['repositories']['branch']
current_product = self._entropy.Settings()['repositories']['product']
current_branch = self._entropy.Settings()['repositories']['branch']
current_product = self._entropy.Settings()['repositories']['product']
try:
repoid, repodata = \
self._entropy.Settings()._analyze_client_repo_string(text,
current_branch, current_product)
self._load_repo_data(repodata)
else:
except AttributeError:
okDialog( self.addrepo_ui.addRepoWin,
_("This Repository identification string is malformed") )