Skip to content
Snippets Groups Projects
Commit 3579051c authored by Ruben Rodriguez's avatar Ruben Rodriguez
Browse files

software-properties helper updated for flidas

parent 9c8ed6f9
No related branches found
No related tags found
2 merge requests!183Fix geoip-database-contrib,!150Fix pbuilder branding for flidas
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2011 Rubén Rodríguez <ruben@trisquel.info> # Copyright (C) 2011-2016 Rubén Rodríguez <ruben@trisquel.info>
# Copyright (C) 2011 Carlos Pais <freemind@lavabit.com> # Copyright (C) 2011 Carlos Pais <freemind@lavabit.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
...@@ -18,18 +18,17 @@ ...@@ -18,18 +18,17 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=5 VERSION=1
. ./config . ./config
cat << EOF | patch -p1 cat << EOF | patch -p1
--- source.orig/softwareproperties/SoftwareProperties.py 2014-04-14 17:10:58.000000000 +0200 --- source.orig/softwareproperties/SoftwareProperties.py 2014-04-14 17:10:58.000000000 +0200
+++ source/softwareproperties/SoftwareProperties.py 2014-05-18 03:02:05.309290804 +0200 +++ source/softwareproperties/SoftwareProperties.py 2014-05-18 03:02:05.309290804 +0200
@@ -724,7 +724,15 @@ @@ -725,8 +725,16 @@
site is in whitelist or the shortcut implementer adds it. site is in whitelist or the shortcut implementer adds it.
""" """
- (deb_line, file) = shortcut.expand(codename=self.distro.codename)
+ codenames = {} + codenames = {}
+ codenames["flidas"] = "xenial" + codenames["flidas"] = "xenial"
+ codenames["belenos"] = "trusty" + codenames["belenos"] = "trusty"
...@@ -40,6 +39,8 @@ cat << EOF | patch -p1 ...@@ -40,6 +39,8 @@ cat << EOF | patch -p1
+ codenames["taranis"] = "lucid" + codenames["taranis"] = "lucid"
+ codenames["awen"] = "karmic" + codenames["awen"] = "karmic"
+ (deb_line, file) = shortcut.expand(codename=codenames[self.distro.codename]) + (deb_line, file) = shortcut.expand(codename=codenames[self.distro.codename])
- (deb_line, file) = shortcut.expand(
- codename=self.distro.codename, distro=self.distro.id.lower())
deb_line = self.expand_http_line(deb_line) deb_line = self.expand_http_line(deb_line)
debsrc_entry_type = 'deb-src' if enable_source_code else '# deb-src' debsrc_entry_type = 'deb-src' if enable_source_code else '# deb-src'
debsrc_line = debsrc_entry_type + deb_line[3:] debsrc_line = debsrc_entry_type + deb_line[3:]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment