summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@gentoo.org>2005-11-14 19:49:20 +0000
committerGunnar Wrobel <wrobel@gentoo.org>2005-11-14 19:49:20 +0000
commit501c411f2a8956592d7025efefbb040751a4f9ee (patch)
treec468259a22ed38f55d8b55b9da3eab157441bd07 /net-fs/flickrfs
parentFlickrfs fix (diff)
downloadoverlay-501c411f2a8956592d7025efefbb040751a4f9ee.tar.gz
overlay-501c411f2a8956592d7025efefbb040751a4f9ee.tar.bz2
overlay-501c411f2a8956592d7025efefbb040751a4f9ee.zip
Flickrfs fix
svn path=/; revision=521
Diffstat (limited to 'net-fs/flickrfs')
-rw-r--r--net-fs/flickrfs/files/flickrfs-1.1.patch28
1 files changed, 17 insertions, 11 deletions
diff --git a/net-fs/flickrfs/files/flickrfs-1.1.patch b/net-fs/flickrfs/files/flickrfs-1.1.patch
index 5dd827a..f2d6cb1 100644
--- a/net-fs/flickrfs/files/flickrfs-1.1.patch
+++ b/net-fs/flickrfs/files/flickrfs-1.1.patch
@@ -9,31 +9,36 @@ diff -Naur flickrfs-1.1/flickrapi.py flickrfs-1.1-mod/flickrapi.py
#
diff -Naur flickrfs-1.1/flickrfs.conf flickrfs-1.1-mod/flickrfs.conf
--- flickrfs-1.1/flickrfs.conf 1970-01-01 01:00:00.000000000 +0100
-+++ flickrfs-1.1-mod/flickrfs.conf 2005-11-14 20:03:15.000000000 +0100
-@@ -0,0 +1,13 @@
++++ flickrfs-1.1-mod/flickrfs.conf 2005-11-14 20:48:31.000000000 +0100
+@@ -0,0 +1,18 @@
+[USER]
+
-+# API key
++# for out-of-band auth inside a web browser
++browserName : "/usr/bin/firefox"
++
++
++#-------------------------------------------------------------------
++
++# It is not necessary to change these. They just identifies this as
++# this application as flickrfs so that flickr.com can track the
++# usage by different api's
+
++# API key
+flickrAPIKey : "f8aa9917a9ae5e44a87cae657924f42d"
+
+# shared "secret"
-+
+flickrSecret : "3fbf7144be7eca28"
+
-+# for out-of-band auth inside a web browser
-+
-+browserName : "/usr/bin/firefox"
diff -Naur flickrfs-1.1/flickrfs.py flickrfs-1.1-mod/flickrfs.py
--- flickrfs-1.1/flickrfs.py 2005-11-08 22:01:39.000000000 +0100
-+++ flickrfs-1.1-mod/flickrfs.py 2005-11-14 20:44:30.000000000 +0100
++++ flickrfs-1.1-mod/flickrfs.py 2005-11-14 20:49:04.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!python
#@+leo-ver=4
#@+node:@file flickrfs.py
# v0.9 - Initial release
-@@ -48,11 +48,25 @@
+@@ -48,11 +48,26 @@
#Import flickr python api
from flickrapi import FlickrAPI
@@ -44,13 +49,14 @@ diff -Naur flickrfs-1.1/flickrfs.py flickrfs-1.1-mod/flickrfs.py
flickrSecret = "3fbf7144be7eca28" # shared "secret"
browserName = "/usr/bin/firefox" # for out-of-band auth inside a web browser
-+def read_config(config_file = '/etc/flickerfs/flickerfs.conf'):
++def read_config(config_file = '/etc/flickrfs/flickrfs.conf'):
+ defaults = {
+ 'flickrAPIKey' : "f8aa9917a9ae5e44a87cae657924f42d", # API key
+ 'flickrSecret' : "3fbf7144be7eca28", # shared "secret"
+ 'browserName' : "/usr/bin/firefox",} # for out-of-band auth inside a web browser
+
+ config = ConfigParser(defaults)
++ self.config.add_section('USER')
+
+ if os.access(config_file, os.R_OK):
+ config.read(config_file)
@@ -59,7 +65,7 @@ diff -Naur flickrfs-1.1/flickrfs.py flickrfs-1.1-mod/flickrfs.py
class TransFlickr: #Transactions with flickr
def uploadfile(self, filepath, taglist, bufData, mode):
-@@ -700,6 +714,12 @@
+@@ -700,6 +715,12 @@
#@+node:mainline
if __name__ == '__main__':