mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-08 13:17:38 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
#Patch sent to upstream on March 1st, 2009
|
|
#Jesus Rivero (Neurogeek)
|
|
#Replaced deprecated os.popen3 for subprocess
|
|
|
|
diff -uNr xdg.orig/Menu.py xdg/Menu.py
|
|
--- xdg.orig/Menu.py 2009-03-01 04:34:38.000000000 -0430
|
|
+++ xdg/Menu.py 2009-03-01 04:41:27.000000000 -0430
|
|
@@ -12,6 +12,7 @@
|
|
|
|
import xdg.Locale
|
|
import xdg.Config
|
|
+from subprocess import Popen, PIPE
|
|
|
|
ELEMENT_NODE = xml.dom.Node.ELEMENT_NODE
|
|
|
|
@@ -841,13 +842,16 @@
|
|
return m
|
|
|
|
def __parseKDELegacyDirs(filename, parent):
|
|
- f=os.popen3("kde-config --path apps")
|
|
- output = f[1].readlines()
|
|
try:
|
|
- for dir in output[0].split(":"):
|
|
- __parseLegacyDir(dir,"kde", filename, parent)
|
|
- except IndexError:
|
|
- pass
|
|
+ f=Popen("kde-config --path apps", shell=True, stdout=PIPE).stdout
|
|
+ output = f.readlines()
|
|
+ try:
|
|
+ for dir in output[0].split(":"):
|
|
+ __parseLegacyDir(dir,"kde", filename, parent)
|
|
+ except IndexError:
|
|
+ pass
|
|
+ except:
|
|
+ raise Exception, "kde-config failed"
|
|
|
|
# remove duplicate entries from a list
|
|
def __removeDuplicates(list):
|