mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2016-01-22 11:48:04 -04:00
commit d928d77924
Failed to extract signature
11 changed files with 368 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
doc/bugs/Doesn__39__t_build_with_QuickCheck_2.8.2.mdwn Normal file
View file

@ -0,0 +1,30 @@
### Please describe the problem.
I am getting build errors when trying to compile git-annex with QuickCheck 2.8.2.
### What steps will reproduce the problem?
Build git-annex with QuickCheck 2.8.2, and get the following errors:
[ 30 of 535] Compiling Utility.QuickCheck ( Utility/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/QuickCheck.o )
Utility/QuickCheck.hs:24:10:
Duplicate instance declarations:
instance (Arbitrary k, Arbitrary v, Eq k, Ord k) =>
Arbitrary (M.Map k v)
-- Defined at Utility/QuickCheck.hs:24:10
instance [safe] (Ord k, Arbitrary k, Arbitrary v) =>
Arbitrary (M.Map k v)
-- Defined in `Test.QuickCheck.Arbitrary'
Utility/QuickCheck.hs:27:10:
Duplicate instance declarations:
instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v)
-- Defined at Utility/QuickCheck.hs:27:10
instance [safe] (Ord a, Arbitrary a) => Arbitrary (S.Set a)
-- Defined in `Test.QuickCheck.Arbitrary'
### What version of git-annex are you using? On what operating system?
git-annex 6.20160114, on Arch Linux x86_64.
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Yes, it built fine with QuickCheck 2.8. I didn't test with 2.8.1, though.

180
doc/bugs/Volume_monitor_in_GNOME_3.18.mdwn Normal file
View file

@ -0,0 +1,180 @@
### Please describe the problem.
The assistant prints _"No known volume monitor available through dbus; falling back to mtab polling"_ on startup. Based on source code, it expects to find `org.gtk.Private.UDisks2VolumeMonitor` on the session bus.
However, gvfs 1.26 (on GNOME 3.18) has renamed the service to `org.gtk.vfs.UDisks2VolumeMonitor` instead, and git-annex doesn't know about that yet.
### What steps will reproduce the problem?
Start the assistant on GNOME 3.18.
### What version of git-annex are you using? On what operating system?
Arch Linux:
git-annex 6.20160114-8
gvfs 1.26.2-1
### Please provide any additional information below.
The signals seem to have the same format:
[[!format text """
signal time=1453449272.593009 sender=:1.25 -> destination=(null destination) serial=2270 path=/org/gtk/Private/RemoteVolumeMonitor; interface=org.gtk.Private.RemoteVolumeMonitor; member=MountAdded
string "org.gtk.vfs.UDisks2VolumeMonitor"
string "0x1981b90"
struct {
string "0x1981b90"
string "A0D8-7268"
string ". GThemedIcon drive-harddisk-usb drive-harddisk drive"
string ". GThemedIcon drive-harddisk-usb-symbolic drive-harddisk-symbolic drive-symbolic drive-harddisk-usb drive-harddisk drive"
string ""
string "file:///run/media/grawity/A0D8-7268"
boolean true
string "0x7f396402a400"
array [
]
string "gvfs.time_detected_usec.1453449272586665"
array [
]
}
"""]]
The DBus interface looks like this:
[[!format text """
$ gdbus introspect -e -d org.gtk.vfs.UDisks2VolumeMonitor -o / -r
node /org/gtk/Private/RemoteVolumeMonitor {
interface org.freedesktop.DBus.Properties {
methods:
Get(in s interface_name,
in s property_name,
out v value);
GetAll(in s interface_name,
out a{sv} properties);
Set(in s interface_name,
in s property_name,
in v value);
signals:
PropertiesChanged(s interface_name,
a{sv} changed_properties,
as invalidated_properties);
properties:
};
interface org.freedesktop.DBus.Introspectable {
methods:
Introspect(out s xml_data);
signals:
properties:
};
interface org.freedesktop.DBus.Peer {
methods:
Ping();
GetMachineId(out s machine_uuid);
signals:
properties:
};
interface org.gtk.Private.RemoteVolumeMonitor {
methods:
IsSupported(out b is_supported);
List(out a(ssssbbbbbbbbuasa{ss}sa{sv}) drives,
out a(ssssssbbssa{ss}sa{sv}) volumes,
out a(ssssssbsassa{sv}) mounts);
CancelOperation(in s cancellation_id,
out b was_cancelled);
MountUnmount(in s id,
in s cancellation_id,
in u unmount_flags,
in s mount_op_id);
VolumeMount(in s id,
in s cancellation_id,
in u mount_flags,
in s mount_op_id);
DriveEject(in s id,
in s cancellation_id,
in u unmount_flags,
in s mount_op_id);
DrivePollForMedia(in s id,
in s cancellation_id);
DriveStart(in s id,
in s cancellation_id,
in u flags,
in s mount_op_id);
DriveStop(in s id,
in s cancellation_id,
in u unmount_flags,
in s mount_op_id);
MountOpReply(in s mount_op_id,
in i result,
in s user_name,
in s domain,
in s encoded_password,
in i password_save,
in i choice,
in b anonymous);
signals:
DriveChanged(s dbus_name,
s id,
(ssssbbbbbbbbuasa{ss}sa{sv}) drive);
DriveConnected(s dbus_name,
s id,
(ssssbbbbbbbbuasa{ss}sa{sv}) drive);
DriveDisconnected(s dbus_name,
s id,
(ssssbbbbbbbbuasa{ss}sa{sv}) drive);
DriveEjectButton(s dbus_name,
s id,
(ssssbbbbbbbbuasa{ss}sa{sv}) drive);
DriveStopButton(s dbus_name,
s id,
(ssssbbbbbbbbuasa{ss}sa{sv}) drive);
VolumeChanged(s dbus_name,
s id,
(ssssssbbssa{ss}sa{sv}) volume);
VolumeAdded(s dbus_name,
s id,
(ssssssbbssa{ss}sa{sv}) volume);
VolumeRemoved(s dbus_name,
s id,
(ssssssbbssa{ss}sa{sv}) volume);
MountChanged(s dbus_name,
s id,
(ssssssbsassa{sv}) mount);
MountAdded(s dbus_name,
s id,
(ssssssbsassa{sv}) mount);
MountPreUnmount(s dbus_name,
s id,
(ssssssbsassa{sv}) mount);
MountRemoved(s dbus_name,
s id,
(ssssssbsassa{sv}) mount);
MountOpAskPassword(s dbus_name,
s id,
s message_to_show,
s default_user,
s default_domain,
u flags);
MountOpAskQuestion(s dbus_name,
s id,
s message_to_show,
as choices);
MountOpShowProcesses(s dbus_name,
s id,
s message_to_show,
ai pid,
as choices);
MountOpShowUnmountProgress(s dbus_name,
s id,
s message_to_show,
x time_left,
x bytes_left);
MountOpAborted(s dbus_name,
s id);
properties:
};
};
"""]]
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Works fine in general.

36
doc/bugs/Volume_monitor_in_GNOME_3.18/comment_1_e4ac26a8683a45872946eef2b54c85da._comment Normal file
View file

@ -0,0 +1,36 @@
[[!comment format=mdwn
username="grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f"
nickname="grawity"
subject="gvfs reliability"
date="2016-01-22T08:02:12Z"
content="""
As a side note: gvfs volume monitor doesn't emit `MountAdded` for _all_ mounts – as far as I can see, it only does so for mountpoints that are meant to be _visible in the GUI_. So there's no `MountAdded` signal if I manually mount something on `/mnt`.
Using UDisks2 directly may be more reliable (and does not require the desktop session). It is available on the system bus as `org.freedesktop.UDisks2`:
[[!format text \"\"\"
signal time=1453449434.447244 sender=:1.8475 -> destination=(null destination) serial=1846 path=/org/freedesktop/UDisks2/block_devices/sdb1; interface=org.freedesktop.DBus.Properties; member=PropertiesChanged
string \"org.freedesktop.UDisks2.Filesystem\"
array [
dict entry(
string \"MountPoints\"
variant array [
array of bytes \"/mnt\" + \0
]
)
]
array [
]
signal time=1453449440.453104 sender=:1.8475 -> destination=(null destination) serial=1847 path=/org/freedesktop/UDisks2/block_devices/sdb1; interface=org.freedesktop.DBus.Properties; member=PropertiesChanged
string \"org.freedesktop.UDisks2.Filesystem\"
array [
dict entry(
string \"MountPoints\"
variant array [
]
)
]
array [
]
\"\"\"]
"""]]

8
doc/bugs/Volume_monitor_in_GNOME_3.18/comment_2_1421ad9e2533a00ebfc76df8f0a92a6a._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f"
nickname="grawity"
subject="comment 2"
date="2016-01-22T08:11:18Z"
content="""
Seems like I failed at comment formatting. But another addition: UDisks2 might also be a good idea because it's already used by _both_ Gvfs (GNOME/Xfce) and KDE _and_ Enlightenment 17+ and Deepin, which might be an improvement over the current \"gvfs vs unreliable kde stuff\" code split.
"""]]

14
doc/bugs/debian__47__rules_clean_fails_with_with_cabal_not_found/comment_2_75106c66c846708dc798e28024710177._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="jtgeibel@4ad445b2ef940dedb1b6d9b19e3888e56b33541b"
nickname="jtgeibel"
subject="source-only build"
date="2016-01-21T05:09:52Z"
content="""
Yeah, my patch is definitely incorrect.
Until now, I've been able to build a source-only package on a local machine which does not have ghc, cabal, or any haskell libraries installed. The binary packages are then built in a PPA which includes backports of all the build-deps. I'd like to avoid adding that PPA and all those dependencies to my local machine.
The top level command I'm using to build the source package is `gbp buildpackage --git-debian-branch=wily --git-sign-tags --git-tag -S -sa` and this adds `-d` when calling `dpkg-buildpackage` which does not check build dependencies and conflicts.
For now I've installed the dependencies and have my v6 builds! Maybe `debian/cabal-wrapper` can detect the condition where cabal is not installed and the subcommand is \"clean\" and return success, since if cabal is not installed there won't be anything to clean.
"""]]

23
doc/forum/Compile_Problem_with_latest_git_pull_version.mdwn Normal file
View file

@ -0,0 +1,23 @@
Hi,
I try to compile the latest version of git annex on my server;
As you can see some package (WARP) failed to install :
[root@git-annex]$ cat /home/reyman64/.cabal/logs/warp-3.1.11.log
Configuring warp-3.1.11...
Building warp-3.1.11...
Preprocessing library warp-3.1.11...
[ 1 of 35] Compiling Network.Wai.Handler.Warp.Windows ( Network/Wai/Handler/Warp/Windows.hs, dist/build/Network/Wai/Handler/Warp/Windows.o )
[ 2 of 35] Compiling Paths_warp ( dist/build/autogen/Paths_warp.hs, dist/build/Paths_warp.o )
[ 3 of 35] Compiling Network.Wai.Handler.Warp.ReadInt ( Network/Wai/Handler/Warp/ReadInt.hs, dist/build/Network/Wai/Handler/Warp/ReadInt.o )
[ 4 of 35] Compiling Network.Wai.Handler.Warp.HTTP2.EncodeFrame ( Network/Wai/Handler/Warp/HTTP2/EncodeFrame.hs, dist/build/Network/Wai/Handler/Warp/HTTP2/EncodeFrame.o )
[ 5 of 35] Compiling Network.Wai.Handler.Warp.MultiMap ( Network/Wai/Handler/Warp/MultiMap.hs, dist/build/Network/Wai/Handler/Warp/MultiMap.o )
[ 6 of 35] Compiling Network.Wai.Handler.Warp.IORef ( Network/Wai/Handler/Warp/IORef.hs, dist/build/Network/Wai/Handler/Warp/IORef.o )
[ 7 of 35] Compiling Network.Wai.Handler.Warp.HTTP2.Manager ( Network/Wai/Handler/Warp/HTTP2/Manager.hs, dist/build/Network/Wai/Handler/Warp/HTTP2/Manager.o )
[ 8 of 35] Compiling Network.Wai.Handler.Warp.Counter ( Network/Wai/Handler/Warp/Counter.hs, dist/build/Network/Wai/Handler/Warp/Counter.o )
[ 9 of 35] Compiling Network.Wai.Handler.Warp.FileInfoCache ( Network/Wai/Handler/Warp/FileInfoCache.hs, dist/build/Network/Wai/Handler/Warp/FileInfoCache.o )
[10 of 35] Compiling Network.Wai.Handler.Warp.Timeout ( Network/Wai/Handler/Warp/Timeout.hs, dist/build/Network/Wai/Handler/Warp/Timeout.o )
Network/Wai/Handler/Warp/Timeout.hs:86:15:
Not in scope: ‘reaperKill’
Perhaps you meant ‘reaperNull’ (imported from Control.Reaper)

16
doc/forum/Compile_Problem_with_latest_git_pull_version/comment_1_0b87183756e860d93b8c0197bac3c0b1._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="reyman64@740e43250854ada1b8484b3bc44b53be03367d70"
nickname="reyman64"
subject="comment 1"
date="2016-01-21T18:21:42Z"
content="""
I think the problem arise here, with the auto-update version :
--dependency=auto-update=auto-update-0.1.2.2-082ccf928dc1747301e11c3fe47c54fa
You need 0.1.3 to solve problem
https://github.com/yesodweb/wai/issues/495
Waiting for new commit :)
"""]]

9
doc/forum/Git_annex_status_always_showing_annexed_files_as_modified/comment_7_cbf7035b218566a9fa1cb656290a9cf0._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="neocryptek"
subject="comment 7"
date="2016-01-21T03:38:56Z"
content="""
version 6.20160114 fixes the problem on windows and status seems to be faster now (probably due to all the overhead of printing text to the console).
Thanks!
"""]]

13
doc/forum/files_got_replaced_by_broken_symblinks__44___how_to_get_them_back__63__/comment_4_362370f02ea77addf9efaed9cb4b433a._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="simon.parzer@f837bbade0d93f560dc574b04e835b7875c4026f"
nickname="simon.parzer"
subject="comment 4"
date="2016-01-21T12:54:57Z"
content="""
I already tried ```git annex fsck```, but it does not report any errors and the files remain unchanged. Here is the output.
simon@simon-desktop /d/Stuff/Music/Amy Kuney - Breaking Bad Habits EP (2006) ±annex/direct/master » git annex fsck 01\ So\ Help\ Me\ God.mp3
fsck 01 So Help Me God.mp3 (checksum...) ok
(recording state in git...)
"""]]

8
doc/git-annex-preferred-content/comment_1_4c24f4513af72214bd5feb69f1ab86bc._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f"
nickname="grawity"
subject="comment 1"
date="2016-01-21T08:35:52Z"
content="""
The `present` expression is mentioned in [standard_groups](https://git-annex.branchable.com/preferred_content/standard_groups/) but doesn't seem to be explicitly documented anywhere. Is it basically the preferred-content equivalent of `--in .`?
"""]]

31
doc/install/fromsource/comment_54_d7fabada8101596954ed7e401a8c460b._comment Normal file
View file

@ -0,0 +1,31 @@
[[!comment format=mdwn
username="reyman64@f52a9d695f5dc1d5b0788fbb9877e9401fae7421"
nickname="reyman64"
subject="Error on compile"
date="2016-01-20T22:50:01Z"
content="""
Hi, i have an error with last pulled version on my system :
[17 of 23] Compiling Text.Feed.Constructor ( src/Text/Feed/Constructor.hs, dist/build/Text/Feed/Constructor.o )
src/Text/Feed/Constructor.hs:131:5: Warning:
Pattern match(es) are non-exhaustive
In a case alternative: Patterns not matched: XMLFeed _
[18 of 23] Compiling Text.Feed.Export ( src/Text/Feed/Export.hs, dist/build/Text/Feed/Export.o )
[19 of 23] Compiling Text.Feed.Import ( src/Text/Feed/Import.hs, dist/build/Text/Feed/Import.o )
[20 of 23] Compiling Text.Feed.Util ( src/Text/Feed/Util.hs, dist/build/Text/Feed/Util.o )
[21 of 23] Compiling Text.Feed.Query ( src/Text/Feed/Query.hs, dist/build/Text/Feed/Query.o )
src/Text/Feed/Query.hs:66:53:
Module ‘Data.Time.Locale.Compat’ does not export ‘rfc822DateFormat’
src/Text/Feed/Query.hs:66:71:
Module
‘Data.Time.Locale.Compat’
does not export
‘iso8601DateFormat’
cabal: Error: some packages failed to install:
feed-0.3.11.1 failed during the building phase. The exception was:
ExitFailure 1
"""]]