Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
package-helpers
Commits
d5a37870
Commit
d5a37870
authored
8 years ago
by
Ruben Rodriguez
Browse files
Options
Downloads
Patches
Plain Diff
python-apt: Fix locale issues that break ubiquity install
parent
e8e10426
No related branches found
No related tags found
1 merge request
!183
Fix geoip-database-contrib
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
helpers/make-python-apt
+18
-1
18 additions, 1 deletion
helpers/make-python-apt
with
18 additions
and
1 deletion
helpers/make-python-apt
+
18
−
1
View file @
d5a37870
...
...
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION
=
1
VERSION=
2
COMPONENT=main
. ./config
...
...
@@ -84,6 +84,23 @@ RepositoryType: deb
_Description: Unsupported updates
EOF
# Fix locale issues that break ubiquity install
cat << EOF | patch -p1
diff -ru source.orig/apt/progress/base.py source/apt/progress/base.py
--- source.orig/apt/progress/base.py 2015-11-26 11:33:29.000000000 -0500
+++ source/apt/progress/base.py 2017-01-07 14:33:29.879872269 -0500
@@ -251,7 +251,8 @@
if match:
self.conffile(match.group(1), match.group(2))
elif status == "pmstatus":
- # FIXME: Float comparison
+ if isinstance(percent, str):
+ percent = float(percent.replace(',' , '.'))
if float(percent) != self.percent or status_str != self.status:
self.status_change(pkgname, float(percent), status_str.strip())
self.percent = float(percent)
EOF
export DEB_BUILD_OPTIONS=nocheck
changelog "Compiled for Trisquel"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment