Skip to content

Commit

Permalink
Fix issue in ConfigManager
Browse files Browse the repository at this point in the history
this fixes #1772
  • Loading branch information
axtloss authored and mirkobrombin committed Jul 14, 2022
1 parent c1e6564 commit 0af00f4
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion AppImageBuilder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ AppDir:
id: com.usebottles.bottles
name: Bottles
icon: com.usebottles.bottles
version: 2022.7.14-brescia
version: 2022.7.14-brescia-1

# Set the python executable as entry point
exec: usr/bin/python3.10
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022.7.14-brescia
2022.7.14-brescia-1
2 changes: 1 addition & 1 deletion data/com.usebottles.bottles.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<display_length compare="ge">768</display_length>
</requires>
<releases>
<release version="2022.7.14-brescia" date="2022-07-14">
<release version="2022.7.14-brescia-1" date="2022-07-14">
<description>
<p>News</p>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
com.usebottles.bottles (2022.7.14-brescia) precise; urgency=low
com.usebottles.bottles (2022.7.14-brescia-1) precise; urgency=low

* Support for Steam runtimes (soldier, scout); if enabled, bottles with Proton use soldier while other runners use scout
* Create Steam shortcuts directly from the program list; requires permission to the Steam path if Flatpak
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project(
'bottles',
version: '2022.7.14-brescia',
version: '2022.7.14-brescia-1',
meson_version: '>= 0.50.0',
default_options: [
'warning_level=2',
Expand Down
2 changes: 1 addition & 1 deletion src/backend/managers/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class ConfigManager(object):

def __init__(self, config_file: str = None, config_string: str = None, config_type: str = 'ini'):
def __init__(self, config_file: str = None, config_type: str = 'ini', config_string: str = None):
self.config_file = config_file
self.config_string = config_string
self.config_type = config_type
Expand Down
2 changes: 1 addition & 1 deletion src/backend/managers/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ def __step_update_config(config, step: dict):
current_user = os.getenv("USER")
conf_path = conf_path.replace("userdir/", f"drive_c/users/{current_user}/")
conf_path = f"{bottle}/{conf_path}"
_conf = ConfigManager(conf_path, conf_type)
_conf = ConfigManager(config_file=conf_path, config_type=conf_type)

for d in del_keys:
_conf.del_key(d)
Expand Down
4 changes: 2 additions & 2 deletions src/params.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
APP_NAME = "Bottles"
APP_NAME_LOWER = APP_NAME.lower()
APP_ID = "com.usebottles.bottles"
VERSION = "2022.7.14-brescia"
VERSION_NUM = "2022.7.14-brescia"
VERSION = "2022.7.14-brescia-1"
VERSION_NUM = "2022.7.14-brescia-1"

# Internal settings not user editable
ANIM_DURATION = 120
Expand Down
2 changes: 1 addition & 1 deletion src/ui/about.ui
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<object class="AdwAboutWindow" id="about_window">
<property name="application-name">Bottles</property>
<property name="modal">True</property>
<property name="version">2022.7.14-brescia</property>
<property name="version">2022.7.14-brescia-1</property>
<property name="copyright" translatable="yes">© 2017-2022 - Bottles Developers</property>
<property name="comments" translatable="yes">Easily manage wineprefix using environments</property>
<property name="website">https://usebottles.com</property>
Expand Down

0 comments on commit 0af00f4

Please sign in to comment.